Skip to content

Commit 0c30412

Browse files
sjaeckelsjaeckel
authored
Merge pull request #503 from libtom/fix-502
Replace (ed|x)25519_set_key by (ed|x)25519_import_raw
2 parents 354c905 + 2d93061 commit 0c30412

15 files changed

+208
-261
lines changed

‎doc/crypt.tex

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5747,24 +5747,19 @@ \subsection{X25519 Key Operations}
57475747
\end{verbatim}
57485748

57495749
To generate a fresh X25529 key, one can use \textit{x25519\_make\_key} which will create a private\&public key-pair.
5750-
5751-
\index{x25519\_set\_key}
5750+
\index{x25519\_import}
57525751
\begin{verbatim}
5753-
int x25519_set_key(const unsigned char *k, unsigned long klen,
5754-
const unsigned char *u, unsigned long ulen,
5755-
curve25519_key *key);
5752+
int x25519_import(const unsigned char *in, unsigned long inlen, curve25519_key *key);
57565753
\end{verbatim}
57575754

5758-
To import a public or private key in raw format, one can use the function \textit{x25519\_set\_key}.
5759-
In case both, the secret part \textit{k} and the public part \textit{u} are given, the operation validates that the given
5760-
public part fits to the secret part.
5755+
The \textit{x25519\_import} function can be used to import a public key in DER-encoded \textit{SubjectPublicKeyInfo} format.
57615756

5762-
\index{x25519\_import}
5757+
\index{x25519\_import\_raw}
57635758
\begin{verbatim}
5764-
int x25519_import(const unsigned char *in, unsigned long inlen, curve25519_key *key);
5759+
int x25519_import_raw(const unsigned char *in, unsigned long inlen, int which, curve25519_key *key);
57655760
\end{verbatim}
57665761

5767-
The \textit{x25519\_import} function can be used to import a public key in DER-encoded \textit{SubjectPublicKeyInfo} format.
5762+
To import a public or private key in raw format, one can use the function \textit{x25519\_import\_raw}.
57685763

57695764
\index{x25519\_import\_x509}
57705765
\begin{verbatim}
@@ -5836,23 +5831,19 @@ \subsection{EdDSA Key Operations}
58365831

58375832
To generate a fresh Ed25529 key, one can use \textit{ed25519\_make\_key} which will create a private\&public key-pair.
58385833

5839-
\index{ed25519\_set\_key}
5834+
\index{ed25519\_import}
58405835
\begin{verbatim}
5841-
int ed25519_set_key(const unsigned char *sk, unsigned long sklen,
5842-
const unsigned char *pk, unsigned long pklen,
5843-
curve25519_key *key);
5836+
int ed25519_import(const unsigned char *in, unsigned long inlen, curve25519_key *key);
58445837
\end{verbatim}
58455838

5846-
To import a public or private key in raw format, one can use the function \textit{ed25519\_set\_key}.
5847-
In case both, the secret part \textit{sk} and the public part \textit{pk} are given, the operation validates that the given
5848-
public part fits to the secret part.
5839+
The \textit{ed25519\_import} function can be used to import a public key in DER-encoded \textit{SubjectPublicKeyInfo} format.
58495840

5850-
\index{ed25519\_import}
5841+
\index{ed25519\_import\_raw}
58515842
\begin{verbatim}
5852-
int ed25519_import(const unsigned char *in, unsigned long inlen, curve25519_key *key);
5843+
int ed25519_import_raw(const unsigned char *in, unsigned long inlen, int which, curve25519_key *key);
58535844
\end{verbatim}
58545845

5855-
The \textit{ed25519\_import} function can be used to import a public key in DER-encoded \textit{SubjectPublicKeyInfo} format.
5846+
To import a public or private key in raw format, one can use the function \textit{ed25519\_import\_raw}.
58565847

58575848
\index{ed25519\_import\_x509}
58585849
\begin{verbatim}

‎libtomcrypt_VS2008.vcproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2511,15 +2511,15 @@
25112511
>
25122512
</File>
25132513
<File
2514-
RelativePath="src\pk\ed25519\ed25519_import_x509.c"
2514+
RelativePath="src\pk\ed25519\ed25519_import_raw.c"
25152515
>
25162516
</File>
25172517
<File
2518-
RelativePath="src\pk\ed25519\ed25519_make_key.c"
2518+
RelativePath="src\pk\ed25519\ed25519_import_x509.c"
25192519
>
25202520
</File>
25212521
<File
2522-
RelativePath="src\pk\ed25519\ed25519_set_key.c"
2522+
RelativePath="src\pk\ed25519\ed25519_make_key.c"
25232523
>
25242524
</File>
25252525
<File
@@ -2647,15 +2647,15 @@
26472647
>
26482648
</File>
26492649
<File
2650-
RelativePath="src\pk\x25519\x25519_import_x509.c"
2650+
RelativePath="src\pk\x25519\x25519_import_raw.c"
26512651
>
26522652
</File>
26532653
<File
2654-
RelativePath="src\pk\x25519\x25519_make_key.c"
2654+
RelativePath="src\pk\x25519\x25519_import_x509.c"
26552655
>
26562656
</File>
26572657
<File
2658-
RelativePath="src\pk\x25519\x25519_set_key.c"
2658+
RelativePath="src\pk\x25519\x25519_make_key.c"
26592659
>
26602660
</File>
26612661
<File

‎makefile.mingw

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/lt
194194
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
195195
src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
196196
src/pk/ecc/ltc_ecc_verify_key.o src/pk/ed25519/ed25519_export.o src/pk/ed25519/ed25519_import.o \
197-
src/pk/ed25519/ed25519_import_pkcs8.o src/pk/ed25519/ed25519_import_x509.o \
198-
src/pk/ed25519/ed25519_make_key.o src/pk/ed25519/ed25519_set_key.o src/pk/ed25519/ed25519_sign.o \
197+
src/pk/ed25519/ed25519_import_pkcs8.o src/pk/ed25519/ed25519_import_raw.o \
198+
src/pk/ed25519/ed25519_import_x509.o src/pk/ed25519/ed25519_make_key.o src/pk/ed25519/ed25519_sign.o \
199199
src/pk/ed25519/ed25519_verify.o src/pk/pkcs1/pkcs_1_i2osp.o src/pk/pkcs1/pkcs_1_mgf1.o \
200200
src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o src/pk/pkcs1/pkcs_1_os2ip.o \
201201
src/pk/pkcs1/pkcs_1_pss_decode.o src/pk/pkcs1/pkcs_1_pss_encode.o src/pk/pkcs1/pkcs_1_v1_5_decode.o \
@@ -204,23 +204,23 @@ src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_get_size.o src/p
204204
src/pk/rsa/rsa_import_pkcs8.o src/pk/rsa/rsa_import_x509.o src/pk/rsa/rsa_key.o \
205205
src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
206206
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/pk/x25519/x25519_export.o \
207-
src/pk/x25519/x25519_import.o src/pk/x25519/x25519_import_pkcs8.o src/pk/x25519/x25519_import_x509.o \
208-
src/pk/x25519/x25519_make_key.o src/pk/x25519/x25519_set_key.o src/pk/x25519/x25519_shared_secret.o \
209-
src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o src/prngs/rng_get_bytes.o \
210-
src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o src/prngs/yarrow.o \
211-
src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o src/stream/chacha/chacha_ivctr32.o \
212-
src/stream/chacha/chacha_ivctr64.o src/stream/chacha/chacha_keystream.o \
213-
src/stream/chacha/chacha_memory.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
214-
src/stream/rabbit/rabbit.o src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o \
215-
src/stream/rc4/rc4_stream_memory.o src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o \
216-
src/stream/salsa20/salsa20_done.o src/stream/salsa20/salsa20_ivctr64.o \
217-
src/stream/salsa20/salsa20_keystream.o src/stream/salsa20/salsa20_memory.o \
218-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
219-
src/stream/salsa20/xsalsa20_memory.o src/stream/salsa20/xsalsa20_setup.o \
220-
src/stream/salsa20/xsalsa20_test.o src/stream/sober128/sober128_stream.o \
221-
src/stream/sober128/sober128_stream_memory.o src/stream/sober128/sober128_test.o \
222-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_memory.o \
223-
src/stream/sosemanuk/sosemanuk_test.o
207+
src/pk/x25519/x25519_import.o src/pk/x25519/x25519_import_pkcs8.o src/pk/x25519/x25519_import_raw.o \
208+
src/pk/x25519/x25519_import_x509.o src/pk/x25519/x25519_make_key.o \
209+
src/pk/x25519/x25519_shared_secret.o src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o \
210+
src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o \
211+
src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
212+
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
213+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
214+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
215+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
216+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
217+
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
218+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
219+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
220+
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
221+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
222+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
223+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
224224

225225
#List of test objects to compile
226226
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/bcrypt_test.o \

‎makefile.msvc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ src/pk/ecc/ltc_ecc_is_point_at_infinity.obj src/pk/ecc/ltc_ecc_map.obj src/pk/ec
187187
src/pk/ecc/ltc_ecc_mulmod.obj src/pk/ecc/ltc_ecc_mulmod_timing.obj src/pk/ecc/ltc_ecc_points.obj \
188188
src/pk/ecc/ltc_ecc_projective_add_point.obj src/pk/ecc/ltc_ecc_projective_dbl_point.obj \
189189
src/pk/ecc/ltc_ecc_verify_key.obj src/pk/ed25519/ed25519_export.obj src/pk/ed25519/ed25519_import.obj \
190-
src/pk/ed25519/ed25519_import_pkcs8.obj src/pk/ed25519/ed25519_import_x509.obj \
191-
src/pk/ed25519/ed25519_make_key.obj src/pk/ed25519/ed25519_set_key.obj src/pk/ed25519/ed25519_sign.obj \
190+
src/pk/ed25519/ed25519_import_pkcs8.obj src/pk/ed25519/ed25519_import_raw.obj \
191+
src/pk/ed25519/ed25519_import_x509.obj src/pk/ed25519/ed25519_make_key.obj src/pk/ed25519/ed25519_sign.obj \
192192
src/pk/ed25519/ed25519_verify.obj src/pk/pkcs1/pkcs_1_i2osp.obj src/pk/pkcs1/pkcs_1_mgf1.obj \
193193
src/pk/pkcs1/pkcs_1_oaep_decode.obj src/pk/pkcs1/pkcs_1_oaep_encode.obj src/pk/pkcs1/pkcs_1_os2ip.obj \
194194
src/pk/pkcs1/pkcs_1_pss_decode.obj src/pk/pkcs1/pkcs_1_pss_encode.obj src/pk/pkcs1/pkcs_1_v1_5_decode.obj \
@@ -197,23 +197,23 @@ src/pk/rsa/rsa_export.obj src/pk/rsa/rsa_exptmod.obj src/pk/rsa/rsa_get_size.obj
197197
src/pk/rsa/rsa_import_pkcs8.obj src/pk/rsa/rsa_import_x509.obj src/pk/rsa/rsa_key.obj \
198198
src/pk/rsa/rsa_make_key.obj src/pk/rsa/rsa_set.obj src/pk/rsa/rsa_sign_hash.obj \
199199
src/pk/rsa/rsa_sign_saltlen_get.obj src/pk/rsa/rsa_verify_hash.obj src/pk/x25519/x25519_export.obj \
200-
src/pk/x25519/x25519_import.obj src/pk/x25519/x25519_import_pkcs8.obj src/pk/x25519/x25519_import_x509.obj \
201-
src/pk/x25519/x25519_make_key.obj src/pk/x25519/x25519_set_key.obj src/pk/x25519/x25519_shared_secret.obj \
202-
src/prngs/chacha20.obj src/prngs/fortuna.obj src/prngs/rc4.obj src/prngs/rng_get_bytes.obj \
203-
src/prngs/rng_make_prng.obj src/prngs/sober128.obj src/prngs/sprng.obj src/prngs/yarrow.obj \
204-
src/stream/chacha/chacha_crypt.obj src/stream/chacha/chacha_done.obj src/stream/chacha/chacha_ivctr32.obj \
205-
src/stream/chacha/chacha_ivctr64.obj src/stream/chacha/chacha_keystream.obj \
206-
src/stream/chacha/chacha_memory.obj src/stream/chacha/chacha_setup.obj src/stream/chacha/chacha_test.obj \
207-
src/stream/rabbit/rabbit.obj src/stream/rabbit/rabbit_memory.obj src/stream/rc4/rc4_stream.obj \
208-
src/stream/rc4/rc4_stream_memory.obj src/stream/rc4/rc4_test.obj src/stream/salsa20/salsa20_crypt.obj \
209-
src/stream/salsa20/salsa20_done.obj src/stream/salsa20/salsa20_ivctr64.obj \
210-
src/stream/salsa20/salsa20_keystream.obj src/stream/salsa20/salsa20_memory.obj \
211-
src/stream/salsa20/salsa20_setup.obj src/stream/salsa20/salsa20_test.obj \
212-
src/stream/salsa20/xsalsa20_memory.obj src/stream/salsa20/xsalsa20_setup.obj \
213-
src/stream/salsa20/xsalsa20_test.obj src/stream/sober128/sober128_stream.obj \
214-
src/stream/sober128/sober128_stream_memory.obj src/stream/sober128/sober128_test.obj \
215-
src/stream/sosemanuk/sosemanuk.obj src/stream/sosemanuk/sosemanuk_memory.obj \
216-
src/stream/sosemanuk/sosemanuk_test.obj
200+
src/pk/x25519/x25519_import.obj src/pk/x25519/x25519_import_pkcs8.obj src/pk/x25519/x25519_import_raw.obj \
201+
src/pk/x25519/x25519_import_x509.obj src/pk/x25519/x25519_make_key.obj \
202+
src/pk/x25519/x25519_shared_secret.obj src/prngs/chacha20.obj src/prngs/fortuna.obj src/prngs/rc4.obj \
203+
src/prngs/rng_get_bytes.obj src/prngs/rng_make_prng.obj src/prngs/sober128.obj src/prngs/sprng.obj \
204+
src/prngs/yarrow.obj src/stream/chacha/chacha_crypt.obj src/stream/chacha/chacha_done.obj \
205+
src/stream/chacha/chacha_ivctr32.obj src/stream/chacha/chacha_ivctr64.obj \
206+
src/stream/chacha/chacha_keystream.obj src/stream/chacha/chacha_memory.obj \
207+
src/stream/chacha/chacha_setup.obj src/stream/chacha/chacha_test.obj src/stream/rabbit/rabbit.obj \
208+
src/stream/rabbit/rabbit_memory.obj src/stream/rc4/rc4_stream.obj src/stream/rc4/rc4_stream_memory.obj \
209+
src/stream/rc4/rc4_test.obj src/stream/salsa20/salsa20_crypt.obj src/stream/salsa20/salsa20_done.obj \
210+
src/stream/salsa20/salsa20_ivctr64.obj src/stream/salsa20/salsa20_keystream.obj \
211+
src/stream/salsa20/salsa20_memory.obj src/stream/salsa20/salsa20_setup.obj \
212+
src/stream/salsa20/salsa20_test.obj src/stream/salsa20/xsalsa20_memory.obj \
213+
src/stream/salsa20/xsalsa20_setup.obj src/stream/salsa20/xsalsa20_test.obj \
214+
src/stream/sober128/sober128_stream.obj src/stream/sober128/sober128_stream_memory.obj \
215+
src/stream/sober128/sober128_test.obj src/stream/sosemanuk/sosemanuk.obj \
216+
src/stream/sosemanuk/sosemanuk_memory.obj src/stream/sosemanuk/sosemanuk_test.obj
217217

218218
#List of test objects to compile
219219
TOBJECTS=tests/base16_test.obj tests/base32_test.obj tests/base64_test.obj tests/bcrypt_test.obj \

‎makefile.unix

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/lt
204204
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
205205
src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
206206
src/pk/ecc/ltc_ecc_verify_key.o src/pk/ed25519/ed25519_export.o src/pk/ed25519/ed25519_import.o \
207-
src/pk/ed25519/ed25519_import_pkcs8.o src/pk/ed25519/ed25519_import_x509.o \
208-
src/pk/ed25519/ed25519_make_key.o src/pk/ed25519/ed25519_set_key.o src/pk/ed25519/ed25519_sign.o \
207+
src/pk/ed25519/ed25519_import_pkcs8.o src/pk/ed25519/ed25519_import_raw.o \
208+
src/pk/ed25519/ed25519_import_x509.o src/pk/ed25519/ed25519_make_key.o src/pk/ed25519/ed25519_sign.o \
209209
src/pk/ed25519/ed25519_verify.o src/pk/pkcs1/pkcs_1_i2osp.o src/pk/pkcs1/pkcs_1_mgf1.o \
210210
src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o src/pk/pkcs1/pkcs_1_os2ip.o \
211211
src/pk/pkcs1/pkcs_1_pss_decode.o src/pk/pkcs1/pkcs_1_pss_encode.o src/pk/pkcs1/pkcs_1_v1_5_decode.o \
@@ -214,23 +214,23 @@ src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_get_size.o src/p
214214
src/pk/rsa/rsa_import_pkcs8.o src/pk/rsa/rsa_import_x509.o src/pk/rsa/rsa_key.o \
215215
src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
216216
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/pk/x25519/x25519_export.o \
217-
src/pk/x25519/x25519_import.o src/pk/x25519/x25519_import_pkcs8.o src/pk/x25519/x25519_import_x509.o \
218-
src/pk/x25519/x25519_make_key.o src/pk/x25519/x25519_set_key.o src/pk/x25519/x25519_shared_secret.o \
219-
src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o src/prngs/rng_get_bytes.o \
220-
src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o src/prngs/yarrow.o \
221-
src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o src/stream/chacha/chacha_ivctr32.o \
222-
src/stream/chacha/chacha_ivctr64.o src/stream/chacha/chacha_keystream.o \
223-
src/stream/chacha/chacha_memory.o src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o \
224-
src/stream/rabbit/rabbit.o src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o \
225-
src/stream/rc4/rc4_stream_memory.o src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o \
226-
src/stream/salsa20/salsa20_done.o src/stream/salsa20/salsa20_ivctr64.o \
227-
src/stream/salsa20/salsa20_keystream.o src/stream/salsa20/salsa20_memory.o \
228-
src/stream/salsa20/salsa20_setup.o src/stream/salsa20/salsa20_test.o \
229-
src/stream/salsa20/xsalsa20_memory.o src/stream/salsa20/xsalsa20_setup.o \
230-
src/stream/salsa20/xsalsa20_test.o src/stream/sober128/sober128_stream.o \
231-
src/stream/sober128/sober128_stream_memory.o src/stream/sober128/sober128_test.o \
232-
src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_memory.o \
233-
src/stream/sosemanuk/sosemanuk_test.o
217+
src/pk/x25519/x25519_import.o src/pk/x25519/x25519_import_pkcs8.o src/pk/x25519/x25519_import_raw.o \
218+
src/pk/x25519/x25519_import_x509.o src/pk/x25519/x25519_make_key.o \
219+
src/pk/x25519/x25519_shared_secret.o src/prngs/chacha20.o src/prngs/fortuna.o src/prngs/rc4.o \
220+
src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o src/prngs/sprng.o \
221+
src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
222+
src/stream/chacha/chacha_ivctr32.o src/stream/chacha/chacha_ivctr64.o \
223+
src/stream/chacha/chacha_keystream.o src/stream/chacha/chacha_memory.o \
224+
src/stream/chacha/chacha_setup.o src/stream/chacha/chacha_test.o src/stream/rabbit/rabbit.o \
225+
src/stream/rabbit/rabbit_memory.o src/stream/rc4/rc4_stream.o src/stream/rc4/rc4_stream_memory.o \
226+
src/stream/rc4/rc4_test.o src/stream/salsa20/salsa20_crypt.o src/stream/salsa20/salsa20_done.o \
227+
src/stream/salsa20/salsa20_ivctr64.o src/stream/salsa20/salsa20_keystream.o \
228+
src/stream/salsa20/salsa20_memory.o src/stream/salsa20/salsa20_setup.o \
229+
src/stream/salsa20/salsa20_test.o src/stream/salsa20/xsalsa20_memory.o \
230+
src/stream/salsa20/xsalsa20_setup.o src/stream/salsa20/xsalsa20_test.o \
231+
src/stream/sober128/sober128_stream.o src/stream/sober128/sober128_stream_memory.o \
232+
src/stream/sober128/sober128_test.o src/stream/sosemanuk/sosemanuk.o \
233+
src/stream/sosemanuk/sosemanuk_memory.o src/stream/sosemanuk/sosemanuk_test.o
234234

235235
#List of test objects to compile (all goes to libtomcrypt_prof.a)
236236
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/bcrypt_test.o \

0 commit comments

Comments
 (0)