From fe1b6eced7ec9fa1b3ff70abc48632fa56a49015 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Tue, 5 Aug 2014 17:21:02 +0200 Subject: [PATCH] add testprof/pkcs_1_pss_test --- demos/test.c | 1 + testprof/makefile | 2 +- testprof/makefile.icc | 2 +- testprof/makefile.mingw | 2 +- testprof/makefile.msvc | 2 +- testprof/makefile.shared | 2 +- testprof/pkcs_1_pss_test.c | 66 ++++++++++++++++++++++++++++++++++++++ testprof/tomcrypt_test.h | 1 + 8 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 testprof/pkcs_1_pss_test.c diff --git a/demos/test.c b/demos/test.c index b19b887..5f95d97 100644 --- a/demos/test.c +++ b/demos/test.c @@ -24,6 +24,7 @@ int main(void) printf("\nmodes_test...."); fflush(stdout); x = modes_test(); printf(x ? "failed" : "passed");if (x) exit(EXIT_FAILURE); printf("\nder_test......"); fflush(stdout); x = der_tests(); printf(x ? "failed" : "passed");if (x) exit(EXIT_FAILURE); printf("\npkcs_1_test..."); fflush(stdout); x = pkcs_1_test(); printf(x ? "failed" : "passed");if (x) exit(EXIT_FAILURE); + printf("\npkcs_1_pss_test...."); fflush(stdout); x = pkcs_1_pss_test(); printf(x ? "failed" : "passed");if (x) exit(EXIT_FAILURE); printf("\nrsa_test......"); fflush(stdout); x = rsa_test(); printf(x ? "failed" : "passed");if (x) exit(EXIT_FAILURE); printf("\ndh_test......."); fflush(stdout); x = dh_test(); printf(x ? "failed" : "passed");if (x) exit(EXIT_FAILURE); printf("\necc_test......"); fflush(stdout); x = ecc_tests(); printf(x ? "failed" : "passed");if (x) exit(EXIT_FAILURE); diff --git a/testprof/makefile b/testprof/makefile index 3069796..1548926 100644 --- a/testprof/makefile +++ b/testprof/makefile @@ -7,7 +7,7 @@ endif OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o \ dsa_test.o ecc_test.o mac_test.o misc_test.o modes_test.o pkcs_1_test.o rsa_test.o \ -store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o +store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o pkcs_1_pss_test.o ifndef LIBTEST_S LIBTEST_S=libtomcrypt_prof.a diff --git a/testprof/makefile.icc b/testprof/makefile.icc index 9912314..2dc4621 100644 --- a/testprof/makefile.icc +++ b/testprof/makefile.icc @@ -3,7 +3,7 @@ CC?=icc OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o \ dsa_test.o ecc_test.o mac_test.o modes_test.o pkcs_1_test.o rsa_test.o \ -store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o misc_test.o +store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o misc_test.o pkcs_1_pss_test.o ifndef LIBTEST_S LIBTEST_S = libtomcrypt_prof.a diff --git a/testprof/makefile.mingw b/testprof/makefile.mingw index da4162e..16eea68 100644 --- a/testprof/makefile.mingw +++ b/testprof/makefile.mingw @@ -6,7 +6,7 @@ CFLAGS = $(CFLAGS_OPTS) -W -I../src/headers -I. -Wall -W OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o \ dsa_test.o ecc_test.o mac_test.o misc_test.o modes_test.o pkcs_1_test.o rsa_test.o \ -store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o +store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o pkcs_1_pss_test.o default: $(LIBTEST_S) diff --git a/testprof/makefile.msvc b/testprof/makefile.msvc index 2115905..dc7f81d 100644 --- a/testprof/makefile.msvc +++ b/testprof/makefile.msvc @@ -3,7 +3,7 @@ CFLAGS = /I../src/headers/ /I./ /Ox /DWIN32 /DLTC_SOURCE /W3 /Fo$@ OBJECTS=base64_test.obj cipher_hash_test.obj der_tests.obj no_prng.obj \ dsa_test.obj ecc_test.obj mac_test.obj modes_test.obj pkcs_1_test.obj \ rsa_test.obj store_test.obj test_driver.obj x86_prof.obj katja_test.obj \ -dh_test.obj misc_test.obj +dh_test.obj misc_test.obj pkcs_1_pss_test.obj tomcrypt_prof.lib: $(OBJECTS) lib /out:tomcrypt_prof.lib $(OBJECTS) diff --git a/testprof/makefile.shared b/testprof/makefile.shared index 00a3db5..637ebdd 100644 --- a/testprof/makefile.shared +++ b/testprof/makefile.shared @@ -8,7 +8,7 @@ CFLAGS += -I../src/headers -I./ -Wall -Wsign-compare -W -Wshadow -Wno-unused-par OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o \ dsa_test.o ecc_test.o mac_test.o modes_test.o pkcs_1_test.o rsa_test.o \ -store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o misc_test.o +store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o misc_test.o pkcs_1_pss_test.o ifndef LIBTEST LIBTEST=libtomcrypt_prof.la diff --git a/testprof/pkcs_1_pss_test.c b/testprof/pkcs_1_pss_test.c new file mode 100644 index 0000000..fe6dbdf --- /dev/null +++ b/testprof/pkcs_1_pss_test.c @@ -0,0 +1,66 @@ +#include + +#ifdef LTC_PKCS_1 + +#include "../notes/rsa-testvectors/pss-vect.c" + + + +int pkcs_1_pss_test(void) +{ + int prng_idx = register_prng(&no_prng_desc); + int hash_idx = find_hash("sha1"); + unsigned int i; + + DO(prng_is_valid(prng_idx)); + DO(hash_is_valid(hash_idx)); + + for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); ++i) { + testcase_t* t = &testcases[i]; + rsa_key k, *key = &k; + DOX(mp_init_multi(&key->e, &key->d, &key->N, &key->dQ, + &key->dP, &key->qP, &key->p, &key->q, NULL), t->name); + + DOX(mp_read_unsigned_bin(key->e, t->rsa.e, t->rsa.e_l), t->name); + DOX(mp_read_unsigned_bin(key->d, t->rsa.d, t->rsa.d_l), t->name); + DOX(mp_read_unsigned_bin(key->N, t->rsa.n, t->rsa.n_l), t->name); + DOX(mp_read_unsigned_bin(key->dQ, t->rsa.dQ, t->rsa.dQ_l), t->name); + DOX(mp_read_unsigned_bin(key->dP, t->rsa.dP, t->rsa.dP_l), t->name); + DOX(mp_read_unsigned_bin(key->qP, t->rsa.qInv, t->rsa.qInv_l), t->name); + DOX(mp_read_unsigned_bin(key->q, t->rsa.q, t->rsa.q_l), t->name); + DOX(mp_read_unsigned_bin(key->p, t->rsa.p, t->rsa.p_l), t->name); + key->type = PK_PRIVATE; + + unsigned int j; + for (j = 0; j < sizeof(t->sig)/sizeof(t->sig[0]); ++j) { + rsaSig_t* s = &t->sig[j]; + unsigned char buf[20], obuf[256]; + unsigned long buflen = sizeof(buf), obuflen = sizeof(obuf); + int stat; + prng_descriptor[prng_idx].add_entropy(s->salt, s->salt_l, NULL); + DOX(hash_memory(hash_idx, s->msg, s->msg_l, buf, &buflen), s->name); + DOX(rsa_sign_hash(buf, buflen, obuf, &obuflen, NULL, prng_idx, hash_idx, s->salt_l, key), s->name); + DOX(memcmp(s->sig, obuf, s->sig_l)==0?CRYPT_OK:CRYPT_FAIL_TESTVECTOR, s->name); + DOX(rsa_verify_hash(obuf, obuflen, buf, buflen, hash_idx, s->salt_l, &stat, key), s->name); + } /* for */ + + mp_clear_multi(key->d, key->e, key->N, key->dQ, key->dP, key->qP, key->p, key->q, NULL); + } /* for */ + + return 0; +} + +#else + +int pkcs_1_pss_test(void) +{ + fprintf(stderr, "NOP"); + return 0; +} + +#endif + + +/* $Source$ */ +/* $Revision$ */ +/* $Date$ */ diff --git a/testprof/tomcrypt_test.h b/testprof/tomcrypt_test.h index ff7dbff..82a2f0e 100644 --- a/testprof/tomcrypt_test.h +++ b/testprof/tomcrypt_test.h @@ -51,6 +51,7 @@ int cipher_hash_test(void); int modes_test(void); int mac_test(void); int pkcs_1_test(void); +int pkcs_1_pss_test(void); int store_test(void); int rsa_test(void); int dh_test(void);