Skip to content

Commit c315b1c

Browse files
sjaeckelsjaeckel
authored
Merge pull request #399 from libtom/remove/katja
Remove katja
2 parents e31e757 + f8ed30b commit c315b1c

21 files changed

+46
-1062
lines changed

‎demos/timing.c‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -821,78 +821,6 @@ static void time_rsa(void)
821821
static void time_rsa(void) { fprintf(stderr, "NO RSA\n"); }
822822
#endif
823823

824-
#if defined(LTC_MKAT)
825-
/* time various KAT operations */
826-
static void time_katja(void)
827-
{
828-
katja_key key;
829-
ulong64 t1, t2;
830-
unsigned char buf[2][4096];
831-
unsigned long x, y, z, zzz;
832-
int err, zz;
833-
834-
if (ltc_mp.name == NULL) return;
835-
836-
for (x = 1024; x <= 2048; x += 256) {
837-
t2 = 0;
838-
for (y = 0; y < 4; y++) {
839-
t_start();
840-
t1 = t_read();
841-
if ((err = katja_make_key(&yarrow_prng, find_prng("yarrow"), x/8, &key)) != CRYPT_OK) {
842-
fprintf(stderr, "\n\nkatja_make_key says %s, wait...no it should say %s...damn you!\n", error_to_string(err), error_to_string(CRYPT_OK));
843-
exit(EXIT_FAILURE);
844-
}
845-
t1 = t_read() - t1;
846-
t2 += t1;
847-
848-
if (y < 3) {
849-
katja_free(&key);
850-
}
851-
}
852-
t2 >>= 2;
853-
fprintf(stderr, "Katja-%lu make_key took %15"PRI64"u cycles\n", x, t2);
854-
855-
t2 = 0;
856-
for (y = 0; y < 16; y++) {
857-
t_start();
858-
t1 = t_read();
859-
z = sizeof(buf[1]);
860-
if ((err = katja_encrypt_key(buf[0], 32, buf[1], &z, "testprog", 8, &yarrow_prng,
861-
find_prng("yarrow"), find_hash("sha1"),
862-
&key)) != CRYPT_OK) {
863-
fprintf(stderr, "\n\nkatja_encrypt_key says %s, wait...no it should say %s...damn you!\n", error_to_string(err), error_to_string(CRYPT_OK));
864-
exit(EXIT_FAILURE);
865-
}
866-
t1 = t_read() - t1;
867-
t2 += t1;
868-
}
869-
t2 >>= 4;
870-
fprintf(stderr, "Katja-%lu encrypt_key took %15"PRI64"u cycles\n", x, t2);
871-
872-
t2 = 0;
873-
for (y = 0; y < 2048; y++) {
874-
t_start();
875-
t1 = t_read();
876-
zzz = sizeof(buf[0]);
877-
if ((err = katja_decrypt_key(buf[1], z, buf[0], &zzz, "testprog", 8, find_hash("sha1"),
878-
&zz, &key)) != CRYPT_OK) {
879-
fprintf(stderr, "\n\nkatja_decrypt_key says %s, wait...no it should say %s...damn you!\n", error_to_string(err), error_to_string(CRYPT_OK));
880-
exit(EXIT_FAILURE);
881-
}
882-
t1 = t_read() - t1;
883-
t2 += t1;
884-
}
885-
t2 >>= 11;
886-
fprintf(stderr, "Katja-%lu decrypt_key took %15"PRI64"u cycles\n", x, t2);
887-
888-
889-
katja_free(&key);
890-
}
891-
}
892-
#else
893-
static void time_katja(void) { fprintf(stderr, "NO Katja\n"); }
894-
#endif
895-
896824
#if defined(LTC_MDH)
897825
/* time various DH operations */
898826
static void time_dh(void)
@@ -1424,7 +1352,6 @@ const struct
14241352
LTC_TEST_FN(time_dsa),
14251353
LTC_TEST_FN(time_ecc),
14261354
LTC_TEST_FN(time_dh),
1427-
LTC_TEST_FN(time_katja)
14281355
};
14291356
char *single_test = NULL;
14301357
unsigned int i;

‎libtomcrypt_VS2008.vcproj‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2387,38 +2387,6 @@
23872387
>
23882388
</File>
23892389
</Filter>
2390-
<Filter
2391-
Name="katja"
2392-
>
2393-
<File
2394-
RelativePath="src\pk\katja\katja_decrypt_key.c"
2395-
>
2396-
</File>
2397-
<File
2398-
RelativePath="src\pk\katja\katja_encrypt_key.c"
2399-
>
2400-
</File>
2401-
<File
2402-
RelativePath="src\pk\katja\katja_export.c"
2403-
>
2404-
</File>
2405-
<File
2406-
RelativePath="src\pk\katja\katja_exptmod.c"
2407-
>
2408-
</File>
2409-
<File
2410-
RelativePath="src\pk\katja\katja_free.c"
2411-
>
2412-
</File>
2413-
<File
2414-
RelativePath="src\pk\katja\katja_import.c"
2415-
>
2416-
</File>
2417-
<File
2418-
RelativePath="src\pk\katja\katja_make_key.c"
2419-
>
2420-
</File>
2421-
</Filter>
24222390
<Filter
24232391
Name="pkcs1"
24242392
>

‎makefile.mingw‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,13 @@ src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/l
186186
src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
187187
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
188188
src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
189-
src/pk/ecc/ltc_ecc_verify_key.o src/pk/katja/katja_decrypt_key.o src/pk/katja/katja_encrypt_key.o \
190-
src/pk/katja/katja_export.o src/pk/katja/katja_exptmod.o src/pk/katja/katja_free.o \
191-
src/pk/katja/katja_import.o src/pk/katja/katja_make_key.o src/pk/pkcs1/pkcs_1_i2osp.o \
192-
src/pk/pkcs1/pkcs_1_mgf1.o src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o \
193-
src/pk/pkcs1/pkcs_1_os2ip.o src/pk/pkcs1/pkcs_1_pss_decode.o src/pk/pkcs1/pkcs_1_pss_encode.o \
194-
src/pk/pkcs1/pkcs_1_v1_5_decode.o src/pk/pkcs1/pkcs_1_v1_5_encode.o src/pk/rsa/rsa_decrypt_key.o \
195-
src/pk/rsa/rsa_encrypt_key.o src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_free.o \
196-
src/pk/rsa/rsa_get_size.o src/pk/rsa/rsa_import.o src/pk/rsa/rsa_import_pkcs8.o \
197-
src/pk/rsa/rsa_import_x509.o src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
189+
src/pk/ecc/ltc_ecc_verify_key.o src/pk/pkcs1/pkcs_1_i2osp.o src/pk/pkcs1/pkcs_1_mgf1.o \
190+
src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o src/pk/pkcs1/pkcs_1_os2ip.o \
191+
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 \
192+
src/pk/pkcs1/pkcs_1_v1_5_encode.o src/pk/rsa/rsa_decrypt_key.o src/pk/rsa/rsa_encrypt_key.o \
193+
src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_free.o src/pk/rsa/rsa_get_size.o \
194+
src/pk/rsa/rsa_import.o src/pk/rsa/rsa_import_pkcs8.o src/pk/rsa/rsa_import_x509.o \
195+
src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
198196
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/prngs/chacha20.o src/prngs/fortuna.o \
199197
src/prngs/rc4.o src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o \
200198
src/prngs/sprng.o src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
@@ -211,10 +209,10 @@ src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_test.o
211209
#List of test objects to compile
212210
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/cipher_hash_test.o \
213211
tests/common.o tests/der_test.o tests/dh_test.o tests/dsa_test.o tests/ecc_test.o tests/file_test.o \
214-
tests/katja_test.o tests/mac_test.o tests/misc_test.o tests/modes_test.o tests/mpi_test.o \
215-
tests/multi_test.o tests/no_prng.o tests/padding_test.o tests/pkcs_1_eme_test.o tests/pkcs_1_emsa_test.o \
216-
tests/pkcs_1_oaep_test.o tests/pkcs_1_pss_test.o tests/pkcs_1_test.o tests/prng_test.o \
217-
tests/rotate_test.o tests/rsa_test.o tests/store_test.o tests/test.o
212+
tests/mac_test.o tests/misc_test.o tests/modes_test.o tests/mpi_test.o tests/multi_test.o tests/no_prng.o \
213+
tests/padding_test.o tests/pkcs_1_eme_test.o tests/pkcs_1_emsa_test.o tests/pkcs_1_oaep_test.o \
214+
tests/pkcs_1_pss_test.o tests/pkcs_1_test.o tests/prng_test.o tests/rotate_test.o tests/rsa_test.o \
215+
tests/store_test.o tests/test.o
218216

219217
#The following headers will be installed by "make install"
220218
HEADERS_PUB=src/headers/tomcrypt.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt_cfg.h \

‎makefile.msvc‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,13 @@ src/pk/ecc/ltc_ecc_export_point.obj src/pk/ecc/ltc_ecc_import_point.obj src/pk/e
179179
src/pk/ecc/ltc_ecc_is_point_at_infinity.obj src/pk/ecc/ltc_ecc_map.obj src/pk/ecc/ltc_ecc_mul2add.obj \
180180
src/pk/ecc/ltc_ecc_mulmod.obj src/pk/ecc/ltc_ecc_mulmod_timing.obj src/pk/ecc/ltc_ecc_points.obj \
181181
src/pk/ecc/ltc_ecc_projective_add_point.obj src/pk/ecc/ltc_ecc_projective_dbl_point.obj \
182-
src/pk/ecc/ltc_ecc_verify_key.obj src/pk/katja/katja_decrypt_key.obj src/pk/katja/katja_encrypt_key.obj \
183-
src/pk/katja/katja_export.obj src/pk/katja/katja_exptmod.obj src/pk/katja/katja_free.obj \
184-
src/pk/katja/katja_import.obj src/pk/katja/katja_make_key.obj src/pk/pkcs1/pkcs_1_i2osp.obj \
185-
src/pk/pkcs1/pkcs_1_mgf1.obj src/pk/pkcs1/pkcs_1_oaep_decode.obj src/pk/pkcs1/pkcs_1_oaep_encode.obj \
186-
src/pk/pkcs1/pkcs_1_os2ip.obj src/pk/pkcs1/pkcs_1_pss_decode.obj src/pk/pkcs1/pkcs_1_pss_encode.obj \
187-
src/pk/pkcs1/pkcs_1_v1_5_decode.obj src/pk/pkcs1/pkcs_1_v1_5_encode.obj src/pk/rsa/rsa_decrypt_key.obj \
188-
src/pk/rsa/rsa_encrypt_key.obj src/pk/rsa/rsa_export.obj src/pk/rsa/rsa_exptmod.obj src/pk/rsa/rsa_free.obj \
189-
src/pk/rsa/rsa_get_size.obj src/pk/rsa/rsa_import.obj src/pk/rsa/rsa_import_pkcs8.obj \
190-
src/pk/rsa/rsa_import_x509.obj src/pk/rsa/rsa_make_key.obj src/pk/rsa/rsa_set.obj src/pk/rsa/rsa_sign_hash.obj \
182+
src/pk/ecc/ltc_ecc_verify_key.obj src/pk/pkcs1/pkcs_1_i2osp.obj src/pk/pkcs1/pkcs_1_mgf1.obj \
183+
src/pk/pkcs1/pkcs_1_oaep_decode.obj src/pk/pkcs1/pkcs_1_oaep_encode.obj src/pk/pkcs1/pkcs_1_os2ip.obj \
184+
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 \
185+
src/pk/pkcs1/pkcs_1_v1_5_encode.obj src/pk/rsa/rsa_decrypt_key.obj src/pk/rsa/rsa_encrypt_key.obj \
186+
src/pk/rsa/rsa_export.obj src/pk/rsa/rsa_exptmod.obj src/pk/rsa/rsa_free.obj src/pk/rsa/rsa_get_size.obj \
187+
src/pk/rsa/rsa_import.obj src/pk/rsa/rsa_import_pkcs8.obj src/pk/rsa/rsa_import_x509.obj \
188+
src/pk/rsa/rsa_make_key.obj src/pk/rsa/rsa_set.obj src/pk/rsa/rsa_sign_hash.obj \
191189
src/pk/rsa/rsa_sign_saltlen_get.obj src/pk/rsa/rsa_verify_hash.obj src/prngs/chacha20.obj src/prngs/fortuna.obj \
192190
src/prngs/rc4.obj src/prngs/rng_get_bytes.obj src/prngs/rng_make_prng.obj src/prngs/sober128.obj \
193191
src/prngs/sprng.obj src/prngs/yarrow.obj src/stream/chacha/chacha_crypt.obj src/stream/chacha/chacha_done.obj \
@@ -204,10 +202,10 @@ src/stream/sosemanuk/sosemanuk.obj src/stream/sosemanuk/sosemanuk_test.obj
204202
#List of test objects to compile
205203
TOBJECTS=tests/base16_test.obj tests/base32_test.obj tests/base64_test.obj tests/cipher_hash_test.obj \
206204
tests/common.obj tests/der_test.obj tests/dh_test.obj tests/dsa_test.obj tests/ecc_test.obj tests/file_test.obj \
207-
tests/katja_test.obj tests/mac_test.obj tests/misc_test.obj tests/modes_test.obj tests/mpi_test.obj \
208-
tests/multi_test.obj tests/no_prng.obj tests/padding_test.obj tests/pkcs_1_eme_test.obj tests/pkcs_1_emsa_test.obj \
209-
tests/pkcs_1_oaep_test.obj tests/pkcs_1_pss_test.obj tests/pkcs_1_test.obj tests/prng_test.obj \
210-
tests/rotate_test.obj tests/rsa_test.obj tests/store_test.obj tests/test.obj
205+
tests/mac_test.obj tests/misc_test.obj tests/modes_test.obj tests/mpi_test.obj tests/multi_test.obj tests/no_prng.obj \
206+
tests/padding_test.obj tests/pkcs_1_eme_test.obj tests/pkcs_1_emsa_test.obj tests/pkcs_1_oaep_test.obj \
207+
tests/pkcs_1_pss_test.obj tests/pkcs_1_test.obj tests/prng_test.obj tests/rotate_test.obj tests/rsa_test.obj \
208+
tests/store_test.obj tests/test.obj
211209

212210
#The following headers will be installed by "make install"
213211
HEADERS_PUB=src/headers/tomcrypt.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt_cfg.h \

‎makefile.unix‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,13 @@ src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/l
196196
src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
197197
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
198198
src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
199-
src/pk/ecc/ltc_ecc_verify_key.o src/pk/katja/katja_decrypt_key.o src/pk/katja/katja_encrypt_key.o \
200-
src/pk/katja/katja_export.o src/pk/katja/katja_exptmod.o src/pk/katja/katja_free.o \
201-
src/pk/katja/katja_import.o src/pk/katja/katja_make_key.o src/pk/pkcs1/pkcs_1_i2osp.o \
202-
src/pk/pkcs1/pkcs_1_mgf1.o src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o \
203-
src/pk/pkcs1/pkcs_1_os2ip.o src/pk/pkcs1/pkcs_1_pss_decode.o src/pk/pkcs1/pkcs_1_pss_encode.o \
204-
src/pk/pkcs1/pkcs_1_v1_5_decode.o src/pk/pkcs1/pkcs_1_v1_5_encode.o src/pk/rsa/rsa_decrypt_key.o \
205-
src/pk/rsa/rsa_encrypt_key.o src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_free.o \
206-
src/pk/rsa/rsa_get_size.o src/pk/rsa/rsa_import.o src/pk/rsa/rsa_import_pkcs8.o \
207-
src/pk/rsa/rsa_import_x509.o src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
199+
src/pk/ecc/ltc_ecc_verify_key.o src/pk/pkcs1/pkcs_1_i2osp.o src/pk/pkcs1/pkcs_1_mgf1.o \
200+
src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o src/pk/pkcs1/pkcs_1_os2ip.o \
201+
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 \
202+
src/pk/pkcs1/pkcs_1_v1_5_encode.o src/pk/rsa/rsa_decrypt_key.o src/pk/rsa/rsa_encrypt_key.o \
203+
src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_free.o src/pk/rsa/rsa_get_size.o \
204+
src/pk/rsa/rsa_import.o src/pk/rsa/rsa_import_pkcs8.o src/pk/rsa/rsa_import_x509.o \
205+
src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
208206
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/prngs/chacha20.o src/prngs/fortuna.o \
209207
src/prngs/rc4.o src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o \
210208
src/prngs/sprng.o src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
@@ -221,10 +219,10 @@ src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_test.o
221219
#List of test objects to compile (all goes to libtomcrypt_prof.a)
222220
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/cipher_hash_test.o \
223221
tests/common.o tests/der_test.o tests/dh_test.o tests/dsa_test.o tests/ecc_test.o tests/file_test.o \
224-
tests/katja_test.o tests/mac_test.o tests/misc_test.o tests/modes_test.o tests/mpi_test.o \
225-
tests/multi_test.o tests/no_prng.o tests/padding_test.o tests/pkcs_1_eme_test.o tests/pkcs_1_emsa_test.o \
226-
tests/pkcs_1_oaep_test.o tests/pkcs_1_pss_test.o tests/pkcs_1_test.o tests/prng_test.o \
227-
tests/rotate_test.o tests/rsa_test.o tests/store_test.o tests/test.o
222+
tests/mac_test.o tests/misc_test.o tests/modes_test.o tests/mpi_test.o tests/multi_test.o tests/no_prng.o \
223+
tests/padding_test.o tests/pkcs_1_eme_test.o tests/pkcs_1_emsa_test.o tests/pkcs_1_oaep_test.o \
224+
tests/pkcs_1_pss_test.o tests/pkcs_1_test.o tests/prng_test.o tests/rotate_test.o tests/rsa_test.o \
225+
tests/store_test.o tests/test.o
228226

229227
#The following headers will be installed by "make install"
230228
HEADERS_PUB=src/headers/tomcrypt.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt_cfg.h \

‎makefile_include.mk‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -356,15 +356,13 @@ src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/l
356356
src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
357357
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
358358
src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
359-
src/pk/ecc/ltc_ecc_verify_key.o src/pk/katja/katja_decrypt_key.o src/pk/katja/katja_encrypt_key.o \
360-
src/pk/katja/katja_export.o src/pk/katja/katja_exptmod.o src/pk/katja/katja_free.o \
361-
src/pk/katja/katja_import.o src/pk/katja/katja_make_key.o src/pk/pkcs1/pkcs_1_i2osp.o \
362-
src/pk/pkcs1/pkcs_1_mgf1.o src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o \
363-
src/pk/pkcs1/pkcs_1_os2ip.o src/pk/pkcs1/pkcs_1_pss_decode.o src/pk/pkcs1/pkcs_1_pss_encode.o \
364-
src/pk/pkcs1/pkcs_1_v1_5_decode.o src/pk/pkcs1/pkcs_1_v1_5_encode.o src/pk/rsa/rsa_decrypt_key.o \
365-
src/pk/rsa/rsa_encrypt_key.o src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_free.o \
366-
src/pk/rsa/rsa_get_size.o src/pk/rsa/rsa_import.o src/pk/rsa/rsa_import_pkcs8.o \
367-
src/pk/rsa/rsa_import_x509.o src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
359+
src/pk/ecc/ltc_ecc_verify_key.o src/pk/pkcs1/pkcs_1_i2osp.o src/pk/pkcs1/pkcs_1_mgf1.o \
360+
src/pk/pkcs1/pkcs_1_oaep_decode.o src/pk/pkcs1/pkcs_1_oaep_encode.o src/pk/pkcs1/pkcs_1_os2ip.o \
361+
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 \
362+
src/pk/pkcs1/pkcs_1_v1_5_encode.o src/pk/rsa/rsa_decrypt_key.o src/pk/rsa/rsa_encrypt_key.o \
363+
src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_free.o src/pk/rsa/rsa_get_size.o \
364+
src/pk/rsa/rsa_import.o src/pk/rsa/rsa_import_pkcs8.o src/pk/rsa/rsa_import_x509.o \
365+
src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_set.o src/pk/rsa/rsa_sign_hash.o \
368366
src/pk/rsa/rsa_sign_saltlen_get.o src/pk/rsa/rsa_verify_hash.o src/prngs/chacha20.o src/prngs/fortuna.o \
369367
src/prngs/rc4.o src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o \
370368
src/prngs/sprng.o src/prngs/yarrow.o src/stream/chacha/chacha_crypt.o src/stream/chacha/chacha_done.o \
@@ -381,10 +379,10 @@ src/stream/sosemanuk/sosemanuk.o src/stream/sosemanuk/sosemanuk_test.o
381379
# List of test objects to compile (all goes to libtomcrypt_prof.a)
382380
TOBJECTS=tests/base16_test.o tests/base32_test.o tests/base64_test.o tests/cipher_hash_test.o \
383381
tests/common.o tests/der_test.o tests/dh_test.o tests/dsa_test.o tests/ecc_test.o tests/file_test.o \
384-
tests/katja_test.o tests/mac_test.o tests/misc_test.o tests/modes_test.o tests/mpi_test.o \
385-
tests/multi_test.o tests/no_prng.o tests/padding_test.o tests/pkcs_1_eme_test.o tests/pkcs_1_emsa_test.o \
386-
tests/pkcs_1_oaep_test.o tests/pkcs_1_pss_test.o tests/pkcs_1_test.o tests/prng_test.o \
387-
tests/rotate_test.o tests/rsa_test.o tests/store_test.o tests/test.o
382+
tests/mac_test.o tests/misc_test.o tests/modes_test.o tests/mpi_test.o tests/multi_test.o tests/no_prng.o \
383+
tests/padding_test.o tests/pkcs_1_eme_test.o tests/pkcs_1_emsa_test.o tests/pkcs_1_oaep_test.o \
384+
tests/pkcs_1_pss_test.o tests/pkcs_1_test.o tests/prng_test.o tests/rotate_test.o tests/rsa_test.o \
385+
tests/store_test.o tests/test.o
388386

389387
# The following headers will be installed by "make install"
390388
HEADERS_PUB=src/headers/tomcrypt.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt_cfg.h \

‎src/headers/tomcrypt_custom.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,6 @@
425425
#define LTC_DH8192
426426
#endif
427427

428-
/* Include Katja (a Rabin variant like RSA) */
429-
/* #define LTC_MKAT */
430-
431428
/* Digital Signature Algorithm */
432429
#define LTC_MDSA
433430

@@ -548,7 +545,7 @@
548545
#endif
549546
#endif
550547

551-
#if defined(LTC_MECC) || defined(LTC_MRSA) || defined(LTC_MDSA) || defined(LTC_MKAT)
548+
#if defined(LTC_MECC) || defined(LTC_MRSA) || defined(LTC_MDSA)
552549
/* Include the MPI functionality? (required by the PK algorithms) */
553550
#define LTC_MPI
554551

@@ -578,7 +575,7 @@
578575
#error ASN.1 DER requires MPI functionality
579576
#endif
580577

581-
#if (defined(LTC_MDSA) || defined(LTC_MRSA) || defined(LTC_MECC) || defined(LTC_MKAT)) && !defined(LTC_DER)
578+
#if (defined(LTC_MDSA) || defined(LTC_MRSA) || defined(LTC_MECC)) && !defined(LTC_DER)
582579
#error PK requires ASN.1 DER functionality, make sure LTC_DER is enabled
583580
#endif
584581

‎src/headers/tomcrypt_pk.h‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -126,61 +126,6 @@ int rsa_set_crt_params(const unsigned char *dP, unsigned long dPlen,
126126
rsa_key *key);
127127
#endif
128128

129-
/* ---- Katja ---- */
130-
#ifdef LTC_MKAT
131-
132-
/* Min and Max KAT key sizes (in bits) */
133-
#define MIN_KAT_SIZE 1024
134-
#define MAX_KAT_SIZE 4096
135-
136-
/** Katja PKCS style key */
137-
typedef struct KAT_key {
138-
/** Type of key, PK_PRIVATE or PK_PUBLIC */
139-
int type;
140-
/** The private exponent */
141-
void *d;
142-
/** The modulus */
143-
void *N;
144-
/** The p factor of N */
145-
void *p;
146-
/** The q factor of N */
147-
void *q;
148-
/** The 1/q mod p CRT param */
149-
void *qP;
150-
/** The d mod (p - 1) CRT param */
151-
void *dP;
152-
/** The d mod (q - 1) CRT param */
153-
void *dQ;
154-
/** The pq param */
155-
void *pq;
156-
} katja_key;
157-
158-
int katja_make_key(prng_state *prng, int wprng, int size, katja_key *key);
159-
160-
int katja_exptmod(const unsigned char *in, unsigned long inlen,
161-
unsigned char *out, unsigned long *outlen, int which,
162-
katja_key *key);
163-
164-
void katja_free(katja_key *key);
165-
166-
/* These use PKCS #1 v2.0 padding */
167-
int katja_encrypt_key(const unsigned char *in, unsigned long inlen,
168-
unsigned char *out, unsigned long *outlen,
169-
const unsigned char *lparam, unsigned long lparamlen,
170-
prng_state *prng, int prng_idx, int hash_idx, katja_key *key);
171-
172-
int katja_decrypt_key(const unsigned char *in, unsigned long inlen,
173-
unsigned char *out, unsigned long *outlen,
174-
const unsigned char *lparam, unsigned long lparamlen,
175-
int hash_idx, int *stat,
176-
katja_key *key);
177-
178-
/* PKCS #1 import/export */
179-
int katja_export(unsigned char *out, unsigned long *outlen, int type, katja_key *key);
180-
int katja_import(const unsigned char *in, unsigned long inlen, katja_key *key);
181-
182-
#endif
183-
184129
/* ---- DH Routines ---- */
185130
#ifdef LTC_MDH
186131

0 commit comments

Comments
 (0)