wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for building with ./configure --disable-rng.

Browse Source
This commit is contained in:
David Garske
2018-09-18 11:17:39 -07:00
parent b832b7bad3
commit 9e305a01b4
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/api.c
View File

@ -12690,7 +12690,7 @@ static int test_wc_ecc_make_key (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) #if defined(HAVE_ECC) && !defined(WC_NO_RNG)
WC_RNG rng; WC_RNG rng;
ecc_key key; ecc_key key;
@ -12770,7 +12770,7 @@ static int test_wc_ecc_check_key (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) #if defined(HAVE_ECC) && !defined(WC_NO_RNG)
WC_RNG rng; WC_RNG rng;
ecc_key key; ecc_key key;
@ -12817,7 +12817,7 @@ static int test_wc_ecc_size (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) #if defined(HAVE_ECC) && !defined(WC_NO_RNG)
WC_RNG rng; WC_RNG rng;
ecc_key key; ecc_key key;
@ -12863,7 +12863,7 @@ static int test_wc_ecc_signVerify_hash (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_SIGN) && !defined(NO_ASN) #if defined(HAVE_ECC) && defined(HAVE_ECC_SIGN) && !defined(NO_ASN) && !defined(WC_NO_RNG)
WC_RNG rng; WC_RNG rng;
ecc_key key; ecc_key key;
int signH = WOLFSSL_FATAL_ERROR; int signH = WOLFSSL_FATAL_ERROR;
@ -12973,7 +12973,7 @@ static int test_wc_ecc_shared_secret (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_DHE) #if defined(HAVE_ECC) && defined(HAVE_ECC_DHE) && !defined(WC_NO_RNG)
ecc_key key, pubKey; ecc_key key, pubKey;
WC_RNG rng; WC_RNG rng;
int keySz = KEY16; int keySz = KEY16;
@ -13040,7 +13040,7 @@ static int test_wc_ecc_export_x963 (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG)
ecc_key key; ecc_key key;
WC_RNG rng; WC_RNG rng;
byte out[ECC_ASN963_MAX_BUF_SZ]; byte out[ECC_ASN963_MAX_BUF_SZ];
@ -13102,7 +13102,7 @@ static int test_wc_ecc_export_x963_ex (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG)
ecc_key key; ecc_key key;
WC_RNG rng; WC_RNG rng;
byte out[ECC_ASN963_MAX_BUF_SZ]; byte out[ECC_ASN963_MAX_BUF_SZ];
@ -13201,7 +13201,7 @@ static int test_wc_ecc_import_x963 (void)
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_IMPORT) && \ #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_IMPORT) && \
defined(HAVE_ECC_KEY_EXPORT) defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG)
ecc_key pubKey, key; ecc_key pubKey, key;
WC_RNG rng; WC_RNG rng;
byte x963[ECC_ASN963_MAX_BUF_SZ]; byte x963[ECC_ASN963_MAX_BUF_SZ];
@ -13265,7 +13265,7 @@ static int ecc_import_private_key (void)
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_IMPORT) && \ #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_IMPORT) && \
defined(HAVE_ECC_KEY_EXPORT) defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG)
ecc_key key, keyImp; ecc_key key, keyImp;
WC_RNG rng; WC_RNG rng;
byte privKey[ECC_PRIV_KEY_BUF]; /* Raw private key.*/ byte privKey[ECC_PRIV_KEY_BUF]; /* Raw private key.*/
@ -13336,7 +13336,7 @@ static int test_wc_ecc_export_private_only (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG)
ecc_key key; ecc_key key;
WC_RNG rng; WC_RNG rng;
byte out[ECC_PRIV_KEY_BUF]; byte out[ECC_PRIV_KEY_BUF];
@ -13533,7 +13533,7 @@ static int test_wc_ecc_sig_size (void)
{ {
int ret = 0; int ret = 0;
#ifdef HAVE_ECC #if defined(HAVE_ECC) && !defined(WC_NO_RNG)
ecc_key key; ecc_key key;
WC_RNG rng; WC_RNG rng;
int keySz = KEY16; int keySz = KEY16;
@ -13574,7 +13574,7 @@ static int test_wc_ecc_ctx_new (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) #if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) && !defined(WC_NO_RNG)
WC_RNG rng; WC_RNG rng;
ecEncCtx* cli = NULL; ecEncCtx* cli = NULL;
ecEncCtx* srv = NULL; ecEncCtx* srv = NULL;
@ -13625,7 +13625,7 @@ static int test_wc_ecc_ctx_reset (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) #if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) && !defined(WC_NO_RNG)
ecEncCtx* ctx = NULL; ecEncCtx* ctx = NULL;
WC_RNG rng; WC_RNG rng;
@ -13674,7 +13674,7 @@ static int test_wc_ecc_ctx_set_peer_salt (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) #if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) && !defined(WC_NO_RNG)
WC_RNG rng; WC_RNG rng;
ecEncCtx* cliCtx = NULL; ecEncCtx* cliCtx = NULL;
ecEncCtx* servCtx = NULL; ecEncCtx* servCtx = NULL;
@ -13746,7 +13746,7 @@ static int test_wc_ecc_ctx_set_info (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) #if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) && !defined(WC_NO_RNG)
ecEncCtx* ctx = NULL; ecEncCtx* ctx = NULL;
WC_RNG rng; WC_RNG rng;
const char* optInfo = "Optional Test Info."; const char* optInfo = "Optional Test Info.";
@ -13798,7 +13798,8 @@ static int test_wc_ecc_encryptDecrypt (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) && defined(WOLFSSL_AES_128) #if defined(HAVE_ECC) && defined(HAVE_ECC_ENCRYPT) && defined(WOLFSSL_AES_128) \
&& !defined(WC_NO_RNG)
ecc_key srvKey, cliKey; ecc_key srvKey, cliKey;
WC_RNG rng; WC_RNG rng;
const char* msg = "EccBlock Size 16"; const char* msg = "EccBlock Size 16";
@ -13943,7 +13944,7 @@ static int test_wc_ecc_pointFns (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG)
ecc_key key; ecc_key key;
WC_RNG rng; WC_RNG rng;
ecc_point* point = NULL; ecc_point* point = NULL;
@ -14117,7 +14118,7 @@ static int test_wc_ecc_shared_secret_ssh (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_DHE) #if defined(HAVE_ECC) && defined(HAVE_ECC_DHE) && !defined(WC_NO_RNG)
ecc_key key, key2; ecc_key key, key2;
WC_RNG rng; WC_RNG rng;
int keySz = KEY32; int keySz = KEY32;
@ -14199,7 +14200,8 @@ static int test_wc_ecc_verify_hash_ex (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_SIGN) && defined(WOLFSSL_PUBLIC_MP) #if defined(HAVE_ECC) && defined(HAVE_ECC_SIGN) && defined(WOLFSSL_PUBLIC_MP) \
&& !defined(WC_NO_RNG)
ecc_key key; ecc_key key;
WC_RNG rng; WC_RNG rng;
mp_int r; mp_int r;
@ -14328,7 +14330,7 @@ static int test_wc_ecc_mulmod (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && \ #if defined(HAVE_ECC) && !defined(WC_NO_RNG) && \
!(defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_VALIDATE_ECC_IMPORT)) !(defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_VALIDATE_ECC_IMPORT))
ecc_key key1, key2, key3; ecc_key key1, key2, key3;
WC_RNG rng; WC_RNG rng;
@ -14409,7 +14411,7 @@ static int test_wc_ecc_is_valid_idx (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) #if defined(HAVE_ECC) && !defined(WC_NO_RNG)
ecc_key key; ecc_key key;
WC_RNG rng; WC_RNG rng;
int iVal = -2; int iVal = -2;