Skip to content

Commit c380ac4

Browse files
karel-mkarel-m
committed
Update makefiles
1 parent 0b2dab7 commit c380ac4

6 files changed

Lines changed: 136 additions & 64 deletions

File tree

‎libtomcrypt_VS2008.vcproj‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2823,14 +2823,62 @@
28232823
RelativePath="src\pqc\mldsa.c"
28242824
>
28252825
</File>
2826+
<File
2827+
RelativePath="src\pqc\mldsa_export.c"
2828+
>
2829+
</File>
2830+
<File
2831+
RelativePath="src\pqc\mldsa_import.c"
2832+
>
2833+
</File>
2834+
<File
2835+
RelativePath="src\pqc\mldsa_import_pkcs8.c"
2836+
>
2837+
</File>
2838+
<File
2839+
RelativePath="src\pqc\mldsa_import_x509.c"
2840+
>
2841+
</File>
28262842
<File
28272843
RelativePath="src\pqc\mlkem.c"
28282844
>
28292845
</File>
2846+
<File
2847+
RelativePath="src\pqc\mlkem_export.c"
2848+
>
2849+
</File>
2850+
<File
2851+
RelativePath="src\pqc\mlkem_import.c"
2852+
>
2853+
</File>
2854+
<File
2855+
RelativePath="src\pqc\mlkem_import_pkcs8.c"
2856+
>
2857+
</File>
2858+
<File
2859+
RelativePath="src\pqc\mlkem_import_x509.c"
2860+
>
2861+
</File>
28302862
<File
28312863
RelativePath="src\pqc\slhdsa.c"
28322864
>
28332865
</File>
2866+
<File
2867+
RelativePath="src\pqc\slhdsa_export.c"
2868+
>
2869+
</File>
2870+
<File
2871+
RelativePath="src\pqc\slhdsa_import.c"
2872+
>
2873+
</File>
2874+
<File
2875+
RelativePath="src\pqc\slhdsa_import_pkcs8.c"
2876+
>
2877+
</File>
2878+
<File
2879+
RelativePath="src\pqc\slhdsa_import_x509.c"
2880+
>
2881+
</File>
28342882
</Filter>
28352883
<Filter
28362884
Name="prngs"

‎makefile.mingw‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -219,22 +219,25 @@ src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
219219
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/pk/x25519/x25519_export.o \
220220
src/pk/x25519/x25519_import.o src/pk/x25519/x25519_import_pkcs8.o src/pk/x25519/x25519_import_raw.o \
221221
src/pk/x25519/x25519_import_x509.o src/pk/x25519/x25519_make_key.o \
222-
src/pk/x25519/x25519_shared_secret.o src/pqc/mldsa.o src/pqc/mlkem.o src/pqc/slhdsa.o \
223-
src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o src/prngs/rng_get_bytes.o \
224-
src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o src/prngs/yarrow.o \
225-
src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o src/stream/chacha/chacha_ivctr32.o \
226-
src/stream/chacha/chacha_ivctr64.o src/stream/chacha/chacha_keystream.o \
227-
src/stream/chacha/chacha_memory.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
228-
src/stream/rabbit/rabbit.o src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o \
229-
src/stream/rc4/rc4_stream_memory.o src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o \
230-
src/stream/salsa20/salsa20_done.o src/stream/salsa20/salsa20_ivctr64.o \
231-
src/stream/salsa20/salsa20_keystream.o src/stream/salsa20/salsa20_memory.o \
232-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
233-
src/stream/salsa20/xsalsa20_memory.o src/stream/salsa20/xsalsa20_setup.o \
234-
src/stream/salsa20/xsalsa20_test.o src/stream/sober128/sober128_stream.o \
235-
src/stream/sober128/sober128_stream_memory.o src/stream/sober128/sober128_test.o \
236-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_memory.o \
237-
src/stream/sosemanuk/sosemanuk_test.o
222+
src/pk/x25519/x25519_shared_secret.o src/pqc/mldsa.o src/pqc/mldsa_export.o src/pqc/mldsa_import.o \
223+
src/pqc/mldsa_import_pkcs8.o src/pqc/mldsa_import_x509.o src/pqc/mlkem.o src/pqc/mlkem_export.o \
224+
src/pqc/mlkem_import.o src/pqc/mlkem_import_pkcs8.o src/pqc/mlkem_import_x509.o src/pqc/slhdsa.o \
225+
src/pqc/slhdsa_export.o src/pqc/slhdsa_import.o src/pqc/slhdsa_import_pkcs8.o \
226+
src/pqc/slhdsa_import_x509.o src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o \
227+
src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o \
228+
src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
229+
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
230+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
231+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
232+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
233+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
234+
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
235+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
236+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
237+
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
238+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
239+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
240+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
238241

239242
#List of test objects to compile
240243
TOBJECTS=tests/argon2_test.o tests/base16_test.o tests/base32_test.o tests/base64_test.o \

‎makefile.msvc‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -212,22 +212,25 @@ src/pk/rsa/rsa_make_key.obj src/pk/rsa/rsa_set.obj src/pk/rsa/rsa_sign_hash.obj
212212
src/pk/rsa/rsa_sign_saltlen_get.obj src/pk/rsa/rsa_verify_hash.obj src/pk/x25519/x25519_export.obj \
213213
src/pk/x25519/x25519_import.obj src/pk/x25519/x25519_import_pkcs8.obj src/pk/x25519/x25519_import_raw.obj \
214214
src/pk/x25519/x25519_import_x509.obj src/pk/x25519/x25519_make_key.obj \
215-
src/pk/x25519/x25519_shared_secret.obj src/pqc/mldsa.obj src/pqc/mlkem.obj src/pqc/slhdsa.obj \
216-
src/prngs/chacha20.obj src/prngs/fortuna.obj src/prngs/rc4.obj src/prngs/rng_get_bytes.obj \
217-
src/prngs/rng_make_prng.obj src/prngs/sober128.obj src/prngs/sprng.obj src/prngs/yarrow.obj \
218-
src/stream/chacha/chacha_crypt.obj src/stream/chacha/chacha_done.obj src/stream/chacha/chacha_ivctr32.obj \
219-
src/stream/chacha/chacha_ivctr64.obj src/stream/chacha/chacha_keystream.obj \
220-
src/stream/chacha/chacha_memory.obj src/stream/chacha/chacha_setup.obj src/stream/chacha/chacha_test.obj \
221-
src/stream/rabbit/rabbit.obj src/stream/rabbit/rabbit_memory.obj src/stream/rc4/rc4_stream.obj \
222-
src/stream/rc4/rc4_stream_memory.obj src/stream/rc4/rc4_test.obj src/stream/salsa20/salsa20_crypt.obj \
223-
src/stream/salsa20/salsa20_done.obj src/stream/salsa20/salsa20_ivctr64.obj \
224-
src/stream/salsa20/salsa20_keystream.obj src/stream/salsa20/salsa20_memory.obj \
225-
src/stream/salsa20/salsa20_setup.obj src/stream/salsa20/salsa20_test.obj \
226-
src/stream/salsa20/xsalsa20_memory.obj src/stream/salsa20/xsalsa20_setup.obj \
227-
src/stream/salsa20/xsalsa20_test.obj src/stream/sober128/sober128_stream.obj \
228-
src/stream/sober128/sober128_stream_memory.obj src/stream/sober128/sober128_test.obj \
229-
src/stream/sosemanuk/sosemanuk.obj src/stream/sosemanuk/sosemanuk_memory.obj \
230-
src/stream/sosemanuk/sosemanuk_test.obj
215+
src/pk/x25519/x25519_shared_secret.obj src/pqc/mldsa.obj src/pqc/mldsa_export.obj src/pqc/mldsa_import.obj \
216+
src/pqc/mldsa_import_pkcs8.obj src/pqc/mldsa_import_x509.obj src/pqc/mlkem.obj src/pqc/mlkem_export.obj \
217+
src/pqc/mlkem_import.obj src/pqc/mlkem_import_pkcs8.obj src/pqc/mlkem_import_x509.obj src/pqc/slhdsa.obj \
218+
src/pqc/slhdsa_export.obj src/pqc/slhdsa_import.obj src/pqc/slhdsa_import_pkcs8.obj \
219+
src/pqc/slhdsa_import_x509.obj src/prngs/chacha20.obj src/prngs/fortuna.obj src/prngs/rc4.obj \
220+
src/prngs/rng_get_bytes.obj src/prngs/rng_make_prng.obj src/prngs/sober128.obj src/prngs/sprng.obj \
221+
src/prngs/yarrow.obj src/stream/chacha/chacha_crypt.obj src/stream/chacha/chacha_done.obj \
222+
src/stream/chacha/chacha_ivctr32.obj src/stream/chacha/chacha_ivctr64.obj \
223+
src/stream/chacha/chacha_keystream.obj src/stream/chacha/chacha_memory.obj \
224+
src/stream/chacha/chacha_setup.obj src/stream/chacha/chacha_test.obj src/stream/rabbit/rabbit.obj \
225+
src/stream/rabbit/rabbit_memory.obj src/stream/rc4/rc4_stream.obj src/stream/rc4/rc4_stream_memory.obj \
226+
src/stream/rc4/rc4_test.obj src/stream/salsa20/salsa20_crypt.obj src/stream/salsa20/salsa20_done.obj \
227+
src/stream/salsa20/salsa20_ivctr64.obj src/stream/salsa20/salsa20_keystream.obj \
228+
src/stream/salsa20/salsa20_memory.obj src/stream/salsa20/salsa20_setup.obj \
229+
src/stream/salsa20/salsa20_test.obj src/stream/salsa20/xsalsa20_memory.obj \
230+
src/stream/salsa20/xsalsa20_setup.obj src/stream/salsa20/xsalsa20_test.obj \
231+
src/stream/sober128/sober128_stream.obj src/stream/sober128/sober128_stream_memory.obj \
232+
src/stream/sober128/sober128_test.obj src/stream/sosemanuk/sosemanuk.obj \
233+
src/stream/sosemanuk/sosemanuk_memory.obj src/stream/sosemanuk/sosemanuk_test.obj
231234

232235
#List of test objects to compile
233236
TOBJECTS=tests/argon2_test.obj tests/base16_test.obj tests/base32_test.obj tests/base64_test.obj \

‎makefile.unix‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -233,22 +233,25 @@ src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
233233
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/pk/x25519/x25519_export.o \
234234
src/pk/x25519/x25519_import.o src/pk/x25519/x25519_import_pkcs8.o src/pk/x25519/x25519_import_raw.o \
235235
src/pk/x25519/x25519_import_x509.o src/pk/x25519/x25519_make_key.o \
236-
src/pk/x25519/x25519_shared_secret.o src/pqc/mldsa.o src/pqc/mlkem.o src/pqc/slhdsa.o \
237-
src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o src/prngs/rng_get_bytes.o \
238-
src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o src/prngs/yarrow.o \
239-
src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o src/stream/chacha/chacha_ivctr32.o \
240-
src/stream/chacha/chacha_ivctr64.o src/stream/chacha/chacha_keystream.o \
241-
src/stream/chacha/chacha_memory.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
242-
src/stream/rabbit/rabbit.o src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o \
243-
src/stream/rc4/rc4_stream_memory.o src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o \
244-
src/stream/salsa20/salsa20_done.o src/stream/salsa20/salsa20_ivctr64.o \
245-
src/stream/salsa20/salsa20_keystream.o src/stream/salsa20/salsa20_memory.o \
246-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
247-
src/stream/salsa20/xsalsa20_memory.o src/stream/salsa20/xsalsa20_setup.o \
248-
src/stream/salsa20/xsalsa20_test.o src/stream/sober128/sober128_stream.o \
249-
src/stream/sober128/sober128_stream_memory.o src/stream/sober128/sober128_test.o \
250-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_memory.o \
251-
src/stream/sosemanuk/sosemanuk_test.o
236+
src/pk/x25519/x25519_shared_secret.o src/pqc/mldsa.o src/pqc/mldsa_export.o src/pqc/mldsa_import.o \
237+
src/pqc/mldsa_import_pkcs8.o src/pqc/mldsa_import_x509.o src/pqc/mlkem.o src/pqc/mlkem_export.o \
238+
src/pqc/mlkem_import.o src/pqc/mlkem_import_pkcs8.o src/pqc/mlkem_import_x509.o src/pqc/slhdsa.o \
239+
src/pqc/slhdsa_export.o src/pqc/slhdsa_import.o src/pqc/slhdsa_import_pkcs8.o \
240+
src/pqc/slhdsa_import_x509.o src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o \
241+
src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o \
242+
src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
243+
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
244+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
245+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
246+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
247+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
248+
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
249+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
250+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
251+
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
252+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
253+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
254+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
252255

253256
#List of test objects to compile (all goes to libtomcrypt_prof.a)
254257
TOBJECTS=tests/argon2_test.o tests/base16_test.o tests/base32_test.o tests/base64_test.o \

‎makefile_include.mk‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -404,22 +404,25 @@ src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
404404
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/pk/x25519/x25519_export.o \
405405
src/pk/x25519/x25519_import.o src/pk/x25519/x25519_import_pkcs8.o src/pk/x25519/x25519_import_raw.o \
406406
src/pk/x25519/x25519_import_x509.o src/pk/x25519/x25519_make_key.o \
407-
src/pk/x25519/x25519_shared_secret.o src/pqc/mldsa.o src/pqc/mlkem.o src/pqc/slhdsa.o \
408-
src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o src/prngs/rng_get_bytes.o \
409-
src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o src/prngs/yarrow.o \
410-
src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o src/stream/chacha/chacha_ivctr32.o \
411-
src/stream/chacha/chacha_ivctr64.o src/stream/chacha/chacha_keystream.o \
412-
src/stream/chacha/chacha_memory.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
413-
src/stream/rabbit/rabbit.o src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o \
414-
src/stream/rc4/rc4_stream_memory.o src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o \
415-
src/stream/salsa20/salsa20_done.o src/stream/salsa20/salsa20_ivctr64.o \
416-
src/stream/salsa20/salsa20_keystream.o src/stream/salsa20/salsa20_memory.o \
417-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
418-
src/stream/salsa20/xsalsa20_memory.o src/stream/salsa20/xsalsa20_setup.o \
419-
src/stream/salsa20/xsalsa20_test.o src/stream/sober128/sober128_stream.o \
420-
src/stream/sober128/sober128_stream_memory.o src/stream/sober128/sober128_test.o \
421-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_memory.o \
422-
src/stream/sosemanuk/sosemanuk_test.o
407+
src/pk/x25519/x25519_shared_secret.o src/pqc/mldsa.o src/pqc/mldsa_export.o src/pqc/mldsa_import.o \
408+
src/pqc/mldsa_import_pkcs8.o src/pqc/mldsa_import_x509.o src/pqc/mlkem.o src/pqc/mlkem_export.o \
409+
src/pqc/mlkem_import.o src/pqc/mlkem_import_pkcs8.o src/pqc/mlkem_import_x509.o src/pqc/slhdsa.o \
410+
src/pqc/slhdsa_export.o src/pqc/slhdsa_import.o src/pqc/slhdsa_import_pkcs8.o \
411+
src/pqc/slhdsa_import_x509.o src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o \
412+
src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o \
413+
src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
414+
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
415+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
416+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
417+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
418+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
419+
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
420+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
421+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
422+
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
423+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
424+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
425+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
423426
else
424427
OBJECTS=pre_gen/tomcrypt_amalgam.o
425428

‎sources.cmake‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,20 @@ src/pk/x25519/x25519_import_x509.c
498498
src/pk/x25519/x25519_make_key.c
499499
src/pk/x25519/x25519_shared_secret.c
500500
src/pqc/mldsa.c
501+
src/pqc/mldsa_export.c
502+
src/pqc/mldsa_import.c
503+
src/pqc/mldsa_import_pkcs8.c
504+
src/pqc/mldsa_import_x509.c
501505
src/pqc/mlkem.c
506+
src/pqc/mlkem_export.c
507+
src/pqc/mlkem_import.c
508+
src/pqc/mlkem_import_pkcs8.c
509+
src/pqc/mlkem_import_x509.c
502510
src/pqc/slhdsa.c
511+
src/pqc/slhdsa_export.c
512+
src/pqc/slhdsa_import.c
513+
src/pqc/slhdsa_import_pkcs8.c
514+
src/pqc/slhdsa_import_x509.c
503515
src/prngs/chacha20.c
504516
src/prngs/fortuna.c
505517
src/prngs/rc4.c

0 commit comments

Comments
 (0)