Skip to content

Commit 305a589

Browse files
buggywhipbuggywhip
committed
update makefiles
1 parent e77ad63 commit 305a589

File tree

5 files changed

+64
-24
lines changed

5 files changed

+64
-24
lines changed

‎libtomcrypt_VS2008.vcproj‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2582,6 +2582,10 @@
25822582
RelativePath="src\stream\chacha\chacha_keystream.c"
25832583
>
25842584
</File>
2585+
<File
2586+
RelativePath="src\stream\chacha\chacha_memory.c"
2587+
>
2588+
</File>
25852589
<File
25862590
RelativePath="src\stream\chacha\chacha_setup.c"
25872591
>
@@ -2598,6 +2602,10 @@
25982602
RelativePath="src\stream\rabbit\rabbit.c"
25992603
>
26002604
</File>
2605+
<File
2606+
RelativePath="src\stream\rabbit\rabbit_memory.c"
2607+
>
2608+
</File>
26012609
</Filter>
26022610
<Filter
26032611
Name="rc4"
@@ -2606,6 +2614,10 @@
26062614
RelativePath="src\stream\rc4\rc4_stream.c"
26072615
>
26082616
</File>
2617+
<File
2618+
RelativePath="src\stream\rc4\rc4_stream_memory.c"
2619+
>
2620+
</File>
26092621
<File
26102622
RelativePath="src\stream\rc4\rc4_test.c"
26112623
>
@@ -2630,6 +2642,10 @@
26302642
RelativePath="src\stream\salsa20\salsa20_keystream.c"
26312643
>
26322644
</File>
2645+
<File
2646+
RelativePath="src\stream\salsa20\salsa20_memory.c"
2647+
>
2648+
</File>
26332649
<File
26342650
RelativePath="src\stream\salsa20\salsa20_setup.c"
26352651
>
@@ -2638,6 +2654,10 @@
26382654
RelativePath="src\stream\salsa20\salsa20_test.c"
26392655
>
26402656
</File>
2657+
<File
2658+
RelativePath="src\stream\salsa20\xsalsa20_memory.c"
2659+
>
2660+
</File>
26412661
<File
26422662
RelativePath="src\stream\salsa20\xsalsa20_setup.c"
26432663
>
@@ -2654,6 +2674,10 @@
26542674
RelativePath="src\stream\sober128\sober128_stream.c"
26552675
>
26562676
</File>
2677+
<File
2678+
RelativePath="src\stream\sober128\sober128_stream_memory.c"
2679+
>
2680+
</File>
26572681
<File
26582682
RelativePath="src\stream\sober128\sober128_test.c"
26592683
>
@@ -2710,6 +2734,10 @@
27102734
RelativePath="src\stream\sosemanuk\sosemanuk.c"
27112735
>
27122736
</File>
2737+
<File
2738+
RelativePath="src\stream\sosemanuk\sosemanuk_memory.c"
2739+
>
2740+
</File>
27132741
<File
27142742
RelativePath="src\stream\sosemanuk\sosemanuk_test.c"
27152743
>

‎makefile.mingw‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,17 @@ src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/prngs/chacha2
199199
src/prngs/rc4.o src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o \
200200
src/prngs/sprng.o src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
201201
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
202-
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
203-
src/stream/rabbit/rabbit.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_test.o \
204-
src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
202+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
203+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
204+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
205+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
205206
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
206-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
207+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
208+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
207209
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
208-
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_test.o \
209-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_test.o
210+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
211+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
212+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
210213

211214
#List of test objects to compile
212215
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/cipher_hash_test.o \

‎makefile.msvc‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,17 @@ src/pk/rsa/rsa_sign_saltlen_get.obj src/pk/rsa/rsa_verify_hash.obj src/prngs/cha
192192
src/prngs/rc4.obj src/prngs/rng_get_bytes.obj src/prngs/rng_make_prng.obj src/prngs/sober128.obj \
193193
src/prngs/sprng.obj src/prngs/yarrow.obj src/stream/chacha/chacha_crypt.obj src/stream/chacha/chacha_done.obj \
194194
src/stream/chacha/chacha_ivctr32.obj src/stream/chacha/chacha_ivctr64.obj \
195-
src/stream/chacha/chacha_keystream.obj src/stream/chacha/chacha_setup.obj src/stream/chacha/chacha_test.obj \
196-
src/stream/rabbit/rabbit.obj src/stream/rc4/rc4_stream.obj src/stream/rc4/rc4_test.obj \
197-
src/stream/salsa20/salsa20_crypt.obj src/stream/salsa20/salsa20_done.obj \
195+
src/stream/chacha/chacha_keystream.obj src/stream/chacha/chacha_memory.obj \
196+
src/stream/chacha/chacha_setup.obj src/stream/chacha/chacha_test.obj src/stream/rabbit/rabbit.obj \
197+
src/stream/rabbit/rabbit_memory.obj src/stream/rc4/rc4_stream.obj src/stream/rc4/rc4_stream_memory.obj \
198+
src/stream/rc4/rc4_test.obj src/stream/salsa20/salsa20_crypt.obj src/stream/salsa20/salsa20_done.obj \
198199
src/stream/salsa20/salsa20_ivctr64.obj src/stream/salsa20/salsa20_keystream.obj \
199-
src/stream/salsa20/salsa20_setup.obj src/stream/salsa20/salsa20_test.obj \
200+
src/stream/salsa20/salsa20_memory.obj src/stream/salsa20/salsa20_setup.obj \
201+
src/stream/salsa20/salsa20_test.obj src/stream/salsa20/xsalsa20_memory.obj \
200202
src/stream/salsa20/xsalsa20_setup.obj src/stream/salsa20/xsalsa20_test.obj \
201-
src/stream/sober128/sober128_stream.obj src/stream/sober128/sober128_test.obj \
202-
src/stream/sosemanuk/sosemanuk.obj src/stream/sosemanuk/sosemanuk_test.obj
203+
src/stream/sober128/sober128_stream.obj src/stream/sober128/sober128_stream_memory.obj \
204+
src/stream/sober128/sober128_test.obj src/stream/sosemanuk/sosemanuk.obj \
205+
src/stream/sosemanuk/sosemanuk_memory.obj src/stream/sosemanuk/sosemanuk_test.obj
203206

204207
#List of test objects to compile
205208
TOBJECTS=tests/base16_test.obj tests/base32_test.obj tests/base64_test.obj tests/cipher_hash_test.obj \

‎makefile.unix‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,17 @@ src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/prngs/chacha2
209209
src/prngs/rc4.o src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o \
210210
src/prngs/sprng.o src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
211211
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
212-
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
213-
src/stream/rabbit/rabbit.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_test.o \
214-
src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
212+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
213+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
214+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
215+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
215216
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
216-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
217+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
218+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
217219
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
218-
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_test.o \
219-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_test.o
220+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
221+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
222+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
220223

221224
#List of test objects to compile (all goes to libtomcrypt_prof.a)
222225
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/cipher_hash_test.o \

‎makefile_include.mk‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,14 +369,17 @@ src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/prngs/chacha2
369369
src/prngs/rc4.o src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o \
370370
src/prngs/sprng.o src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
371371
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
372-
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
373-
src/stream/rabbit/rabbit.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_test.o \
374-
src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
372+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
373+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
374+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
375+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
375376
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
376-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
377+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
378+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
377379
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
378-
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_test.o \
379-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_test.o
380+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
381+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
382+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
380383

381384
# List of test objects to compile (all goes to libtomcrypt_prof.a)
382385
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/cipher_hash_test.o \

0 commit comments

Comments
 (0)