From a5320904bf4f959a6a8a7c31f1da0584b17fe203 Mon Sep 17 00:00:00 2001
From: Paul Bakker
Date: Thu, 19 Dec 2013 17:29:52 +0100
Subject: [PATCH] Fixed dependency on POLARSSL_GENPRIME in PK tests
---
tests/suites/test_suite_pk.data | 4 ++--
tests/suites/test_suite_pk.function | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/suites/test_suite_pk.data b/tests/suites/test_suite_pk.data
index e27edbdb9..e07495a41 100644
--- a/tests/suites/test_suite_pk.data
+++ b/tests/suites/test_suite_pk.data
@@ -1,5 +1,5 @@
PK utils: RSA
-depends_on:POLARSSL_RSA_C
+depends_on:POLARSSL_RSA_C:POLARSSL_GENPRIME
pk_utils:POLARSSL_PK_RSA:512:64:"RSA"
PK utils: ECKEY
@@ -51,7 +51,7 @@ depends_on:POLARSSL_ECP_C:POLARSSL_ECP_DP_SECP192R1_ENABLED
pk_sign_verify:POLARSSL_PK_ECKEY_DH:POLARSSL_ERR_PK_TYPE_MISMATCH:POLARSSL_ERR_PK_TYPE_MISMATCH
RSA sign-verify
-depends_on:POLARSSL_RSA_C:POLARSSL_PKCS1_V15
+depends_on:POLARSSL_RSA_C:POLARSSL_PKCS1_V15:POLARSSL_GENPRIME
pk_sign_verify:POLARSSL_PK_RSA:0:0
RSA encrypt test vector
diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index e3db1193d..85cdb7498 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -5,7 +5,9 @@ static int rnd_std_rand( void *rng_state, unsigned char *output, size_t len );
static int pk_genkey( pk_context *pk )
{
-#if defined(POLARSSL_RSA_C)
+ ((void) pk);
+
+#if defined(POLARSSL_RSA_C) && defined(POLARSSL_GENPRIME)
if( pk_get_type( pk ) == POLARSSL_PK_RSA )
return rsa_gen_key( pk_rsa( *pk ), rnd_std_rand, NULL, 512, 3 );
#endif