Skip to content

Commit c176083

Browse files
sjaeckelsjaeckel
committed
Update makefiles
1 parent bede8d4 commit c176083

File tree

5 files changed

+24
-64
lines changed

5 files changed

+24
-64
lines changed

‎libtomcrypt_VS2008.vcproj

-28
Original file line numberDiff line numberDiff line change
@@ -1474,10 +1474,6 @@
14741474
RelativePath="src\misc\crypt\crypt_find_hash_oid.c"
14751475
>
14761476
</File>
1477-
<File
1478-
RelativePath="src\misc\crypt\crypt_find_prng.c"
1479-
>
1480-
</File>
14811477
<File
14821478
RelativePath="src\misc\crypt\crypt_fsa.c"
14831479
>
@@ -1498,18 +1494,6 @@
14981494
RelativePath="src\misc\crypt\crypt_ltc_mp_descriptor.c"
14991495
>
15001496
</File>
1501-
<File
1502-
RelativePath="src\misc\crypt\crypt_prng_descriptor.c"
1503-
>
1504-
</File>
1505-
<File
1506-
RelativePath="src\misc\crypt\crypt_prng_is_valid.c"
1507-
>
1508-
</File>
1509-
<File
1510-
RelativePath="src\misc\crypt\crypt_prng_rng_descriptor.c"
1511-
>
1512-
</File>
15131497
<File
15141498
RelativePath="src\misc\crypt\crypt_register_all_ciphers.c"
15151499
>
@@ -1518,10 +1502,6 @@
15181502
RelativePath="src\misc\crypt\crypt_register_all_hashes.c"
15191503
>
15201504
</File>
1521-
<File
1522-
RelativePath="src\misc\crypt\crypt_register_all_prngs.c"
1523-
>
1524-
</File>
15251505
<File
15261506
RelativePath="src\misc\crypt\crypt_register_cipher.c"
15271507
>
@@ -1530,10 +1510,6 @@
15301510
RelativePath="src\misc\crypt\crypt_register_hash.c"
15311511
>
15321512
</File>
1533-
<File
1534-
RelativePath="src\misc\crypt\crypt_register_prng.c"
1535-
>
1536-
</File>
15371513
<File
15381514
RelativePath="src\misc\crypt\crypt_sizes.c"
15391515
>
@@ -1546,10 +1522,6 @@
15461522
RelativePath="src\misc\crypt\crypt_unregister_hash.c"
15471523
>
15481524
</File>
1549-
<File
1550-
RelativePath="src\misc\crypt\crypt_unregister_prng.c"
1551-
>
1552-
</File>
15531525
</Filter>
15541526
<Filter
15551527
Name="hkdf"

‎makefile.mingw

+6-9
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,13 @@ src/misc/crypt/crypt_cipher_descriptor.o src/misc/crypt/crypt_cipher_is_valid.o
9999
src/misc/crypt/crypt_constants.o src/misc/crypt/crypt_find_cipher.o \
100100
src/misc/crypt/crypt_find_cipher_any.o src/misc/crypt/crypt_find_cipher_id.o \
101101
src/misc/crypt/crypt_find_hash.o src/misc/crypt/crypt_find_hash_any.o \
102-
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o \
103-
src/misc/crypt/crypt_find_prng.o src/misc/crypt/crypt_fsa.o src/misc/crypt/crypt_hash_descriptor.o \
104-
src/misc/crypt/crypt_hash_is_valid.o src/misc/crypt/crypt_inits.o \
105-
src/misc/crypt/crypt_ltc_mp_descriptor.o src/misc/crypt/crypt_prng_descriptor.o \
106-
src/misc/crypt/crypt_prng_is_valid.o src/misc/crypt/crypt_prng_rng_descriptor.o \
102+
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o src/misc/crypt/crypt_fsa.o \
103+
src/misc/crypt/crypt_hash_descriptor.o src/misc/crypt/crypt_hash_is_valid.o \
104+
src/misc/crypt/crypt_inits.o src/misc/crypt/crypt_ltc_mp_descriptor.o \
107105
src/misc/crypt/crypt_register_all_ciphers.o src/misc/crypt/crypt_register_all_hashes.o \
108-
src/misc/crypt/crypt_register_all_prngs.o src/misc/crypt/crypt_register_cipher.o \
109-
src/misc/crypt/crypt_register_hash.o src/misc/crypt/crypt_register_prng.o src/misc/crypt/crypt_sizes.o \
110-
src/misc/crypt/crypt_unregister_cipher.o src/misc/crypt/crypt_unregister_hash.o \
111-
src/misc/crypt/crypt_unregister_prng.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
106+
src/misc/crypt/crypt_register_cipher.o src/misc/crypt/crypt_register_hash.o \
107+
src/misc/crypt/crypt_sizes.o src/misc/crypt/crypt_unregister_cipher.o \
108+
src/misc/crypt/crypt_unregister_hash.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
112109
src/misc/hkdf/hkdf_test.o src/misc/mem_neq.o src/misc/padding/padding_depad.o \
113110
src/misc/padding/padding_pad.o src/misc/pbes/pbes.o src/misc/pbes/pbes1.o src/misc/pbes/pbes2.o \
114111
src/misc/pkcs12/pkcs12_kdf.o src/misc/pkcs12/pkcs12_utf8_to_utf16.o src/misc/pkcs5/pkcs_5_1.o \

‎makefile.msvc

+6-9
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,13 @@ src/misc/crypt/crypt_cipher_descriptor.obj src/misc/crypt/crypt_cipher_is_valid.
9292
src/misc/crypt/crypt_constants.obj src/misc/crypt/crypt_find_cipher.obj \
9393
src/misc/crypt/crypt_find_cipher_any.obj src/misc/crypt/crypt_find_cipher_id.obj \
9494
src/misc/crypt/crypt_find_hash.obj src/misc/crypt/crypt_find_hash_any.obj \
95-
src/misc/crypt/crypt_find_hash_id.obj src/misc/crypt/crypt_find_hash_oid.obj \
96-
src/misc/crypt/crypt_find_prng.obj src/misc/crypt/crypt_fsa.obj src/misc/crypt/crypt_hash_descriptor.obj \
97-
src/misc/crypt/crypt_hash_is_valid.obj src/misc/crypt/crypt_inits.obj \
98-
src/misc/crypt/crypt_ltc_mp_descriptor.obj src/misc/crypt/crypt_prng_descriptor.obj \
99-
src/misc/crypt/crypt_prng_is_valid.obj src/misc/crypt/crypt_prng_rng_descriptor.obj \
95+
src/misc/crypt/crypt_find_hash_id.obj src/misc/crypt/crypt_find_hash_oid.obj src/misc/crypt/crypt_fsa.obj \
96+
src/misc/crypt/crypt_hash_descriptor.obj src/misc/crypt/crypt_hash_is_valid.obj \
97+
src/misc/crypt/crypt_inits.obj src/misc/crypt/crypt_ltc_mp_descriptor.obj \
10098
src/misc/crypt/crypt_register_all_ciphers.obj src/misc/crypt/crypt_register_all_hashes.obj \
101-
src/misc/crypt/crypt_register_all_prngs.obj src/misc/crypt/crypt_register_cipher.obj \
102-
src/misc/crypt/crypt_register_hash.obj src/misc/crypt/crypt_register_prng.obj src/misc/crypt/crypt_sizes.obj \
103-
src/misc/crypt/crypt_unregister_cipher.obj src/misc/crypt/crypt_unregister_hash.obj \
104-
src/misc/crypt/crypt_unregister_prng.obj src/misc/error_to_string.obj src/misc/hkdf/hkdf.obj \
99+
src/misc/crypt/crypt_register_cipher.obj src/misc/crypt/crypt_register_hash.obj \
100+
src/misc/crypt/crypt_sizes.obj src/misc/crypt/crypt_unregister_cipher.obj \
101+
src/misc/crypt/crypt_unregister_hash.obj src/misc/error_to_string.obj src/misc/hkdf/hkdf.obj \
105102
src/misc/hkdf/hkdf_test.obj src/misc/mem_neq.obj src/misc/padding/padding_depad.obj \
106103
src/misc/padding/padding_pad.obj src/misc/pbes/pbes.obj src/misc/pbes/pbes1.obj src/misc/pbes/pbes2.obj \
107104
src/misc/pkcs12/pkcs12_kdf.obj src/misc/pkcs12/pkcs12_utf8_to_utf16.obj src/misc/pkcs5/pkcs_5_1.obj \

‎makefile.unix

+6-9
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,13 @@ src/misc/crypt/crypt_cipher_descriptor.o src/misc/crypt/crypt_cipher_is_valid.o
109109
src/misc/crypt/crypt_constants.o src/misc/crypt/crypt_find_cipher.o \
110110
src/misc/crypt/crypt_find_cipher_any.o src/misc/crypt/crypt_find_cipher_id.o \
111111
src/misc/crypt/crypt_find_hash.o src/misc/crypt/crypt_find_hash_any.o \
112-
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o \
113-
src/misc/crypt/crypt_find_prng.o src/misc/crypt/crypt_fsa.o src/misc/crypt/crypt_hash_descriptor.o \
114-
src/misc/crypt/crypt_hash_is_valid.o src/misc/crypt/crypt_inits.o \
115-
src/misc/crypt/crypt_ltc_mp_descriptor.o src/misc/crypt/crypt_prng_descriptor.o \
116-
src/misc/crypt/crypt_prng_is_valid.o src/misc/crypt/crypt_prng_rng_descriptor.o \
112+
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o src/misc/crypt/crypt_fsa.o \
113+
src/misc/crypt/crypt_hash_descriptor.o src/misc/crypt/crypt_hash_is_valid.o \
114+
src/misc/crypt/crypt_inits.o src/misc/crypt/crypt_ltc_mp_descriptor.o \
117115
src/misc/crypt/crypt_register_all_ciphers.o src/misc/crypt/crypt_register_all_hashes.o \
118-
src/misc/crypt/crypt_register_all_prngs.o src/misc/crypt/crypt_register_cipher.o \
119-
src/misc/crypt/crypt_register_hash.o src/misc/crypt/crypt_register_prng.o src/misc/crypt/crypt_sizes.o \
120-
src/misc/crypt/crypt_unregister_cipher.o src/misc/crypt/crypt_unregister_hash.o \
121-
src/misc/crypt/crypt_unregister_prng.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
116+
src/misc/crypt/crypt_register_cipher.o src/misc/crypt/crypt_register_hash.o \
117+
src/misc/crypt/crypt_sizes.o src/misc/crypt/crypt_unregister_cipher.o \
118+
src/misc/crypt/crypt_unregister_hash.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
122119
src/misc/hkdf/hkdf_test.o src/misc/mem_neq.o src/misc/padding/padding_depad.o \
123120
src/misc/padding/padding_pad.o src/misc/pbes/pbes.o src/misc/pbes/pbes1.o src/misc/pbes/pbes2.o \
124121
src/misc/pkcs12/pkcs12_kdf.o src/misc/pkcs12/pkcs12_utf8_to_utf16.o src/misc/pkcs5/pkcs_5_1.o \

‎makefile_include.mk

+6-9
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,13 @@ src/misc/crypt/crypt_cipher_descriptor.o src/misc/crypt/crypt_cipher_is_valid.o
270270
src/misc/crypt/crypt_constants.o src/misc/crypt/crypt_find_cipher.o \
271271
src/misc/crypt/crypt_find_cipher_any.o src/misc/crypt/crypt_find_cipher_id.o \
272272
src/misc/crypt/crypt_find_hash.o src/misc/crypt/crypt_find_hash_any.o \
273-
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o \
274-
src/misc/crypt/crypt_find_prng.o src/misc/crypt/crypt_fsa.o src/misc/crypt/crypt_hash_descriptor.o \
275-
src/misc/crypt/crypt_hash_is_valid.o src/misc/crypt/crypt_inits.o \
276-
src/misc/crypt/crypt_ltc_mp_descriptor.o src/misc/crypt/crypt_prng_descriptor.o \
277-
src/misc/crypt/crypt_prng_is_valid.o src/misc/crypt/crypt_prng_rng_descriptor.o \
273+
src/misc/crypt/crypt_find_hash_id.o src/misc/crypt/crypt_find_hash_oid.o src/misc/crypt/crypt_fsa.o \
274+
src/misc/crypt/crypt_hash_descriptor.o src/misc/crypt/crypt_hash_is_valid.o \
275+
src/misc/crypt/crypt_inits.o src/misc/crypt/crypt_ltc_mp_descriptor.o \
278276
src/misc/crypt/crypt_register_all_ciphers.o src/misc/crypt/crypt_register_all_hashes.o \
279-
src/misc/crypt/crypt_register_all_prngs.o src/misc/crypt/crypt_register_cipher.o \
280-
src/misc/crypt/crypt_register_hash.o src/misc/crypt/crypt_register_prng.o src/misc/crypt/crypt_sizes.o \
281-
src/misc/crypt/crypt_unregister_cipher.o src/misc/crypt/crypt_unregister_hash.o \
282-
src/misc/crypt/crypt_unregister_prng.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
277+
src/misc/crypt/crypt_register_cipher.o src/misc/crypt/crypt_register_hash.o \
278+
src/misc/crypt/crypt_sizes.o src/misc/crypt/crypt_unregister_cipher.o \
279+
src/misc/crypt/crypt_unregister_hash.o src/misc/error_to_string.o src/misc/hkdf/hkdf.o \
283280
src/misc/hkdf/hkdf_test.o src/misc/mem_neq.o src/misc/padding/padding_depad.o \
284281
src/misc/padding/padding_pad.o src/misc/pbes/pbes.o src/misc/pbes/pbes1.o src/misc/pbes/pbes2.o \
285282
src/misc/pkcs12/pkcs12_kdf.o src/misc/pkcs12/pkcs12_utf8_to_utf16.o src/misc/pkcs5/pkcs_5_1.o \

0 commit comments

Comments
 (0)