diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-rsa.c | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/tests/test-rsa.c b/tests/test-rsa.c index 176ba03..853f90f 100644 --- a/tests/test-rsa.c +++ b/tests/test-rsa.c @@ -49,8 +49,7 @@ * Run one modexp test. */ -static int test_modexp(hal_core_t *core, - const char * const kind, +static int test_modexp(const char * const kind, const rsa_tc_t * const tc, const rsa_tc_bn_t * const msg, /* Input message */ const rsa_tc_bn_t * const exp, /* Exponent */ @@ -61,7 +60,6 @@ static int test_modexp(hal_core_t *core, printf("%s test for %lu-bit RSA key\n", kind, (unsigned long) tc->size); hal_modexp_arg_t args = { - .core = core, .msg = msg->val, .msg_len = msg->len, .exp = exp->val, .exp_len = exp->len, .mod = tc->n.val, .mod_len = tc->n.len, @@ -83,8 +81,7 @@ static int test_modexp(hal_core_t *core, * Run one RSA CRT test. */ -static int test_decrypt(hal_core_t *core, - const char * const kind, +static int test_decrypt(const char * const kind, const rsa_tc_t * const tc) { printf("%s test for %lu-bit RSA key\n", kind, (unsigned long) tc->size); @@ -107,7 +104,7 @@ static int test_decrypt(hal_core_t *core, uint8_t result[tc->n.len]; - if ((err = hal_rsa_decrypt(core, NULL, key, tc->m.val, tc->m.len, result, sizeof(result))) != HAL_OK) + if ((err = hal_rsa_decrypt(NULL, NULL, key, tc->m.val, tc->m.len, result, sizeof(result))) != HAL_OK) printf("RSA CRT failed: %s\n", hal_error_string(err)); const int mismatch = (err == HAL_OK && memcmp(result, tc->s.val, tc->s.len) != 0); @@ -124,8 +121,7 @@ static int test_decrypt(hal_core_t *core, * Run one RSA key generation + CRT test. */ -static int test_gen(hal_core_t *core, - const char * const kind, +static int test_gen(const char * const kind, const rsa_tc_t * const tc) { printf("%s test for %lu-bit RSA key\n", kind, (unsigned long) tc->size); @@ -138,7 +134,7 @@ static int test_gen(hal_core_t *core, const uint8_t f4[] = { 0x01, 0x00, 0x01 }; - if ((err = hal_rsa_key_gen(core, &key1, keybuf1, sizeof(keybuf1), bitsToBytes(tc->size), f4, sizeof(f4))) != HAL_OK) + if ((err = hal_rsa_key_gen(NULL, &key1, keybuf1, sizeof(keybuf1), bitsToBytes(tc->size), f4, sizeof(f4))) != HAL_OK) return printf("RSA key generation failed: %s\n", hal_error_string(err)), 0; size_t der_len = 0; @@ -174,7 +170,7 @@ static int test_gen(hal_core_t *core, uint8_t result[tc->n.len]; - if ((err = hal_rsa_decrypt(core, NULL, key1, tc->m.val, tc->m.len, result, sizeof(result))) != HAL_OK) + if ((err = hal_rsa_decrypt(NULL, NULL, key1, tc->m.val, tc->m.len, result, sizeof(result))) != HAL_OK) printf("RSA CRT failed: %s\n", hal_error_string(err)); snprintf(fn, sizeof(fn), "test-rsa-sig-%04lu.der", (unsigned long) tc->size); @@ -192,7 +188,7 @@ static int test_gen(hal_core_t *core, if (err != HAL_OK) /* Deferred failure from hal_rsa_decrypt(), above */ return 0; - if ((err = hal_rsa_encrypt(core, key1, result, sizeof(result), result, sizeof(result))) != HAL_OK) + if ((err = hal_rsa_encrypt(NULL, key1, result, sizeof(result), result, sizeof(result))) != HAL_OK) printf("First RSA signature check failed: %s\n", hal_error_string(err)); int mismatch = 0; @@ -239,7 +235,7 @@ static int test_gen(hal_core_t *core, * the public key passes the signature verification test below. */ - if ((err = hal_rsa_encrypt(core, key2, result, sizeof(result), result, sizeof(result))) != HAL_OK) + if ((err = hal_rsa_encrypt(NULL, key2, result, sizeof(result), result, sizeof(result))) != HAL_OK) return printf("Second RSA signature check failed: %s\n", hal_error_string(err)), 0; if (err == HAL_OK && memcmp(result, tc->m.val, tc->m.len) != 0) @@ -286,34 +282,31 @@ static void _time_check(const struct timeval t0, const int ok) * and try generating a signature with that. */ -static int test_rsa(hal_core_t *core, const rsa_tc_t * const tc) +static int test_rsa(const rsa_tc_t * const tc) { int ok = 1; /* RSA encryption */ - time_check(test_modexp(core, "Verification", tc, &tc->s, &tc->e, &tc->m)); + time_check(test_modexp("Verification", tc, &tc->s, &tc->e, &tc->m)); /* Brute force RSA decryption */ - time_check(test_modexp(core, "Signature (ModExp)", tc, &tc->m, &tc->d, &tc->s)); + time_check(test_modexp("Signature (ModExp)", tc, &tc->m, &tc->d, &tc->s)); /* RSA decyrption using CRT */ - time_check(test_decrypt(core, "Signature (CRT)", tc)); + time_check(test_decrypt("Signature (CRT)", tc)); /* Key generation and CRT -- not test vector, so writes key and sig to file */ - time_check(test_gen(core, "Generation and CRT", tc)); + time_check(test_gen("Generation and CRT", tc)); return ok; } int main(void) { - hal_core_t *core = hal_core_find(MODEXPS6_NAME, NULL); - if (core == NULL) - core = hal_core_find(MODEXPA7_NAME, NULL); - const hal_core_info_t *core_info = hal_core_info(core); + const hal_core_info_t *info = hal_core_info(hal_core_find(MODEXPA7_NAME, NULL)); - if (core_info != NULL) - printf("\"%8.8s\" \"%4.4s\"\n\n", core_info->name, core_info->version); + if (info != NULL) + printf("\"%8.8s\" \"%4.4s\"\n\n", info->name, info->version); /* * Run the test cases. @@ -324,7 +317,7 @@ int main(void) /* Normal test */ for (size_t i = 0; i < (sizeof(rsa_tc)/sizeof(*rsa_tc)); i++) - if (!test_rsa(core, &rsa_tc[i])) + if (!test_rsa(&rsa_tc[i])) return 1; return 0; |