From 0915302b7ffa0757be1859d73f14037f338c0253 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 14 Jul 2015 00:20:03 -0400
Subject: Changes to support Pavel's ModExpS6 core.
---
tests/test-rsa.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
(limited to 'tests')
diff --git a/tests/test-rsa.c b/tests/test-rsa.c
index 0fd2002..4b4d7b3 100644
--- a/tests/test-rsa.c
+++ b/tests/test-rsa.c
@@ -271,9 +271,15 @@ static int test_rsa(const rsa_tc_t * const tc)
/* RSA decyrption using CRT */
time_check(test_decrypt("Signature (CRT)", tc));
+#if 1
+#warning Key generation tests disabled
+#else
+
/* Key generation and CRT -- not test vector, so writes key and sig to file */
time_check(test_gen("Generation and CRT", tc));
+#endif
+
return ok;
}
@@ -287,8 +293,8 @@ int main(int argc, char *argv[])
* Initialize EIM and report what core we're running.
*/
- if ((err = hal_io_read(MODEXP_ADDR_NAME0, name, sizeof(name))) != HAL_OK ||
- (err = hal_io_read(MODEXP_ADDR_VERSION, version, sizeof(version))) != HAL_OK) {
+ if ((err = hal_io_read(MODEXPS6_ADDR_NAME0, name, sizeof(name))) != HAL_OK ||
+ (err = hal_io_read(MODEXPS6_ADDR_VERSION, version, sizeof(version))) != HAL_OK) {
printf("Initialization failed: %s\n", hal_error_string(err));
return 1;
}
@@ -301,6 +307,11 @@ int main(int argc, char *argv[])
hal_modexp_set_debug(1);
+#if 1
+#warning RSA blinding disabled
+ hal_rsa_set_blinding(0);
+#endif
+
/* Normal test */
for (i = 0; i < (sizeof(rsa_tc)/sizeof(*rsa_tc)); i++)
--
cgit v1.2.3
From 2d37968bdcfb97281386ca56cea59d39c0b98f8b Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sat, 18 Jul 2015 16:45:51 +0200
Subject: Re-enable key generation test and RSA blinding.
---
tests/test-rsa.c | 11 -----------
1 file changed, 11 deletions(-)
(limited to 'tests')
diff --git a/tests/test-rsa.c b/tests/test-rsa.c
index 4b4d7b3..f6bf55c 100644
--- a/tests/test-rsa.c
+++ b/tests/test-rsa.c
@@ -271,15 +271,9 @@ static int test_rsa(const rsa_tc_t * const tc)
/* RSA decyrption using CRT */
time_check(test_decrypt("Signature (CRT)", tc));
-#if 1
-#warning Key generation tests disabled
-#else
-
/* Key generation and CRT -- not test vector, so writes key and sig to file */
time_check(test_gen("Generation and CRT", tc));
-#endif
-
return ok;
}
@@ -307,11 +301,6 @@ int main(int argc, char *argv[])
hal_modexp_set_debug(1);
-#if 1
-#warning RSA blinding disabled
- hal_rsa_set_blinding(0);
-#endif
-
/* Normal test */
for (i = 0; i < (sizeof(rsa_tc)/sizeof(*rsa_tc)); i++)
--
cgit v1.2.3