Skip to content

Commit ce68cee

Browse files
sjaeckelsjaeckel
committed
Update makefiles
1 parent 58ea18e commit ce68cee

File tree

6 files changed

+24
-71
lines changed

6 files changed

+24
-71
lines changed

‎libtomcrypt_VS2008.vcproj

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,10 +1486,6 @@
14861486
RelativePath="src\misc\crypt\crypt_find_hash_oid.c"
14871487
>
14881488
</File>
1489-
<File
1490-
RelativePath="src\misc\crypt\crypt_find_prng.c"
1491-
>
1492-
</File>
14931489
<File
14941490
RelativePath="src\misc\crypt\crypt_fsa.c"
14951491
>
@@ -1510,18 +1506,6 @@
15101506
RelativePath="src\misc\crypt\crypt_ltc_mp_descriptor.c"
15111507
>
15121508
</File>
1513-
<File
1514-
RelativePath="src\misc\crypt\crypt_prng_descriptor.c"
1515-
>
1516-
</File>
1517-
<File
1518-
RelativePath="src\misc\crypt\crypt_prng_is_valid.c"
1519-
>
1520-
</File>
1521-
<File
1522-
RelativePath="src\misc\crypt\crypt_prng_rng_descriptor.c"
1523-
>
1524-
</File>
15251509
<File
15261510
RelativePath="src\misc\crypt\crypt_register_all_ciphers.c"
15271511
>
@@ -1530,10 +1514,6 @@
15301514
RelativePath="src\misc\crypt\crypt_register_all_hashes.c"
15311515
>
15321516
</File>
1533-
<File
1534-
RelativePath="src\misc\crypt\crypt_register_all_prngs.c"
1535-
>
1536-
</File>
15371517
<File
15381518
RelativePath="src\misc\crypt\crypt_register_cipher.c"
15391519
>
@@ -1542,10 +1522,6 @@
15421522
RelativePath="src\misc\crypt\crypt_register_hash.c"
15431523
>
15441524
</File>
1545-
<File
1546-
RelativePath="src\misc\crypt\crypt_register_prng.c"
1547-
>
1548-
</File>
15491525
<File
15501526
RelativePath="src\misc\crypt\crypt_sizes.c"
15511527
>
@@ -1558,10 +1534,6 @@
15581534
RelativePath="src\misc\crypt\crypt_unregister_hash.c"
15591535
>
15601536
</File>
1561-
<File
1562-
RelativePath="src\misc\crypt\crypt_unregister_prng.c"
1563-
>
1564-
</File>
15651537
</Filter>
15661538
<Filter
15671539
Name="hkdf"

‎makefile.mingw

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,13 @@ src/misc/crypt/crypt_cipher_descriptor.o src/misc/crypt/crypt_cipher_is_valid.o
100100
src/misc/crypt/crypt_constants.o src/misc/crypt/crypt_find_cipher.o \
101101
src/misc/crypt/crypt_find_cipher_any.o src/misc/crypt/crypt_find_cipher_id.o \
102102
src/misc/crypt/crypt_find_hash.o src/misc/crypt/crypt_find_hash_any.o \
103-
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o \
104-
src/misc/crypt/crypt_find_prng.o src/misc/crypt/crypt_fsa.o src/misc/crypt/crypt_hash_descriptor.o \
105-
src/misc/crypt/crypt_hash_is_valid.o src/misc/crypt/crypt_inits.o \
106-
src/misc/crypt/crypt_ltc_mp_descriptor.o src/misc/crypt/crypt_prng_descriptor.o \
107-
src/misc/crypt/crypt_prng_is_valid.o src/misc/crypt/crypt_prng_rng_descriptor.o \
103+
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o src/misc/crypt/crypt_fsa.o \
104+
src/misc/crypt/crypt_hash_descriptor.o src/misc/crypt/crypt_hash_is_valid.o \
105+
src/misc/crypt/crypt_inits.o src/misc/crypt/crypt_ltc_mp_descriptor.o \
108106
src/misc/crypt/crypt_register_all_ciphers.o src/misc/crypt/crypt_register_all_hashes.o \
109-
src/misc/crypt/crypt_register_all_prngs.o src/misc/crypt/crypt_register_cipher.o \
110-
src/misc/crypt/crypt_register_hash.o src/misc/crypt/crypt_register_prng.o src/misc/crypt/crypt_sizes.o \
111-
src/misc/crypt/crypt_unregister_cipher.o src/misc/crypt/crypt_unregister_hash.o \
112-
src/misc/crypt/crypt_unregister_prng.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
107+
src/misc/crypt/crypt_register_cipher.o src/misc/crypt/crypt_register_hash.o \
108+
src/misc/crypt/crypt_sizes.o src/misc/crypt/crypt_unregister_cipher.o \
109+
src/misc/crypt/crypt_unregister_hash.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
113110
src/misc/hkdf/hkdf_test.o src/misc/mem_neq.o src/misc/padding/padding_depad.o \
114111
src/misc/padding/padding_pad.o src/misc/password_free.o src/misc/pbes/pbes.o src/misc/pbes/pbes1.o \
115112
src/misc/pbes/pbes2.o src/misc/pem/pem.o src/misc/pem/pem_pkcs.o src/misc/pem/pem_read.o \

‎makefile.msvc

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,13 @@ src/misc/crypt/crypt_cipher_descriptor.obj src/misc/crypt/crypt_cipher_is_valid.
9393
src/misc/crypt/crypt_constants.obj src/misc/crypt/crypt_find_cipher.obj \
9494
src/misc/crypt/crypt_find_cipher_any.obj src/misc/crypt/crypt_find_cipher_id.obj \
9595
src/misc/crypt/crypt_find_hash.obj src/misc/crypt/crypt_find_hash_any.obj \
96-
src/misc/crypt/crypt_find_hash_id.obj src/misc/crypt/crypt_find_hash_oid.obj \
97-
src/misc/crypt/crypt_find_prng.obj src/misc/crypt/crypt_fsa.obj src/misc/crypt/crypt_hash_descriptor.obj \
98-
src/misc/crypt/crypt_hash_is_valid.obj src/misc/crypt/crypt_inits.obj \
99-
src/misc/crypt/crypt_ltc_mp_descriptor.obj src/misc/crypt/crypt_prng_descriptor.obj \
100-
src/misc/crypt/crypt_prng_is_valid.obj src/misc/crypt/crypt_prng_rng_descriptor.obj \
96+
src/misc/crypt/crypt_find_hash_id.obj src/misc/crypt/crypt_find_hash_oid.obj src/misc/crypt/crypt_fsa.obj \
97+
src/misc/crypt/crypt_hash_descriptor.obj src/misc/crypt/crypt_hash_is_valid.obj \
98+
src/misc/crypt/crypt_inits.obj src/misc/crypt/crypt_ltc_mp_descriptor.obj \
10199
src/misc/crypt/crypt_register_all_ciphers.obj src/misc/crypt/crypt_register_all_hashes.obj \
102-
src/misc/crypt/crypt_register_all_prngs.obj src/misc/crypt/crypt_register_cipher.obj \
103-
src/misc/crypt/crypt_register_hash.obj src/misc/crypt/crypt_register_prng.obj src/misc/crypt/crypt_sizes.obj \
104-
src/misc/crypt/crypt_unregister_cipher.obj src/misc/crypt/crypt_unregister_hash.obj \
105-
src/misc/crypt/crypt_unregister_prng.obj src/misc/error_to_string.obj src/misc/hkdf/hkdf.obj \
100+
src/misc/crypt/crypt_register_cipher.obj src/misc/crypt/crypt_register_hash.obj \
101+
src/misc/crypt/crypt_sizes.obj src/misc/crypt/crypt_unregister_cipher.obj \
102+
src/misc/crypt/crypt_unregister_hash.obj src/misc/error_to_string.obj src/misc/hkdf/hkdf.obj \
106103
src/misc/hkdf/hkdf_test.obj src/misc/mem_neq.obj src/misc/padding/padding_depad.obj \
107104
src/misc/padding/padding_pad.obj src/misc/password_free.obj src/misc/pbes/pbes.obj src/misc/pbes/pbes1.obj \
108105
src/misc/pbes/pbes2.obj src/misc/pem/pem.obj src/misc/pem/pem_pkcs.obj src/misc/pem/pem_read.obj \

‎makefile.unix

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,13 @@ src/misc/crypt/crypt_cipher_descriptor.o src/misc/crypt/crypt_cipher_is_valid.o
114114
src/misc/crypt/crypt_constants.o src/misc/crypt/crypt_find_cipher.o \
115115
src/misc/crypt/crypt_find_cipher_any.o src/misc/crypt/crypt_find_cipher_id.o \
116116
src/misc/crypt/crypt_find_hash.o src/misc/crypt/crypt_find_hash_any.o \
117-
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o \
118-
src/misc/crypt/crypt_find_prng.o src/misc/crypt/crypt_fsa.o src/misc/crypt/crypt_hash_descriptor.o \
119-
src/misc/crypt/crypt_hash_is_valid.o src/misc/crypt/crypt_inits.o \
120-
src/misc/crypt/crypt_ltc_mp_descriptor.o src/misc/crypt/crypt_prng_descriptor.o \
121-
src/misc/crypt/crypt_prng_is_valid.o src/misc/crypt/crypt_prng_rng_descriptor.o \
117+
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o src/misc/crypt/crypt_fsa.o \
118+
src/misc/crypt/crypt_hash_descriptor.o src/misc/crypt/crypt_hash_is_valid.o \
119+
src/misc/crypt/crypt_inits.o src/misc/crypt/crypt_ltc_mp_descriptor.o \
122120
src/misc/crypt/crypt_register_all_ciphers.o src/misc/crypt/crypt_register_all_hashes.o \
123-
src/misc/crypt/crypt_register_all_prngs.o src/misc/crypt/crypt_register_cipher.o \
124-
src/misc/crypt/crypt_register_hash.o src/misc/crypt/crypt_register_prng.o src/misc/crypt/crypt_sizes.o \
125-
src/misc/crypt/crypt_unregister_cipher.o src/misc/crypt/crypt_unregister_hash.o \
126-
src/misc/crypt/crypt_unregister_prng.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
121+
src/misc/crypt/crypt_register_cipher.o src/misc/crypt/crypt_register_hash.o \
122+
src/misc/crypt/crypt_sizes.o src/misc/crypt/crypt_unregister_cipher.o \
123+
src/misc/crypt/crypt_unregister_hash.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
127124
src/misc/hkdf/hkdf_test.o src/misc/mem_neq.o src/misc/padding/padding_depad.o \
128125
src/misc/padding/padding_pad.o src/misc/password_free.o src/misc/pbes/pbes.o src/misc/pbes/pbes1.o \
129126
src/misc/pbes/pbes2.o src/misc/pem/pem.o src/misc/pem/pem_pkcs.o src/misc/pem/pem_read.o \

‎makefile_include.mk

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -279,16 +279,13 @@ src/misc/crypt/crypt_cipher_descriptor.o src/misc/crypt/crypt_cipher_is_valid.o
279279
src/misc/crypt/crypt_constants.o src/misc/crypt/crypt_find_cipher.o \
280280
src/misc/crypt/crypt_find_cipher_any.o src/misc/crypt/crypt_find_cipher_id.o \
281281
src/misc/crypt/crypt_find_hash.o src/misc/crypt/crypt_find_hash_any.o \
282-
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o \
283-
src/misc/crypt/crypt_find_prng.o src/misc/crypt/crypt_fsa.o src/misc/crypt/crypt_hash_descriptor.o \
284-
src/misc/crypt/crypt_hash_is_valid.o src/misc/crypt/crypt_inits.o \
285-
src/misc/crypt/crypt_ltc_mp_descriptor.o src/misc/crypt/crypt_prng_descriptor.o \
286-
src/misc/crypt/crypt_prng_is_valid.o src/misc/crypt/crypt_prng_rng_descriptor.o \
282+
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o src/misc/crypt/crypt_fsa.o \
283+
src/misc/crypt/crypt_hash_descriptor.o src/misc/crypt/crypt_hash_is_valid.o \
284+
src/misc/crypt/crypt_inits.o src/misc/crypt/crypt_ltc_mp_descriptor.o \
287285
src/misc/crypt/crypt_register_all_ciphers.o src/misc/crypt/crypt_register_all_hashes.o \
288-
src/misc/crypt/crypt_register_all_prngs.o src/misc/crypt/crypt_register_cipher.o \
289-
src/misc/crypt/crypt_register_hash.o src/misc/crypt/crypt_register_prng.o src/misc/crypt/crypt_sizes.o \
290-
src/misc/crypt/crypt_unregister_cipher.o src/misc/crypt/crypt_unregister_hash.o \
291-
src/misc/crypt/crypt_unregister_prng.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
286+
src/misc/crypt/crypt_register_cipher.o src/misc/crypt/crypt_register_hash.o \
287+
src/misc/crypt/crypt_sizes.o src/misc/crypt/crypt_unregister_cipher.o \
288+
src/misc/crypt/crypt_unregister_hash.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
292289
src/misc/hkdf/hkdf_test.o src/misc/mem_neq.o src/misc/padding/padding_depad.o \
293290
src/misc/padding/padding_pad.o src/misc/password_free.o src/misc/pbes/pbes.o src/misc/pbes/pbes1.o \
294291
src/misc/pbes/pbes2.o src/misc/pem/pem.o src/misc/pem/pem_pkcs.o src/misc/pem/pem_read.o \

‎sources.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,25 +211,18 @@ src/misc/crypt/crypt_find_hash.c
211211
src/misc/crypt/crypt_find_hash_any.c
212212
src/misc/crypt/crypt_find_hash_id.c
213213
src/misc/crypt/crypt_find_hash_oid.c
214-
src/misc/crypt/crypt_find_prng.c
215214
src/misc/crypt/crypt_fsa.c
216215
src/misc/crypt/crypt_hash_descriptor.c
217216
src/misc/crypt/crypt_hash_is_valid.c
218217
src/misc/crypt/crypt_inits.c
219218
src/misc/crypt/crypt_ltc_mp_descriptor.c
220-
src/misc/crypt/crypt_prng_descriptor.c
221-
src/misc/crypt/crypt_prng_is_valid.c
222-
src/misc/crypt/crypt_prng_rng_descriptor.c
223219
src/misc/crypt/crypt_register_all_ciphers.c
224220
src/misc/crypt/crypt_register_all_hashes.c
225-
src/misc/crypt/crypt_register_all_prngs.c
226221
src/misc/crypt/crypt_register_cipher.c
227222
src/misc/crypt/crypt_register_hash.c
228-
src/misc/crypt/crypt_register_prng.c
229223
src/misc/crypt/crypt_sizes.c
230224
src/misc/crypt/crypt_unregister_cipher.c
231225
src/misc/crypt/crypt_unregister_hash.c
232-
src/misc/crypt/crypt_unregister_prng.c
233226
src/misc/error_to_string.c
234227
src/misc/hkdf/hkdf.c
235228
src/misc/hkdf/hkdf_test.c

0 commit comments

Comments
 (0)