feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #808 from kojo1/TrialProj

Browse Source 
eccCaKeyFile in RSA/ECC test
This commit is contained in:
dgarske
2017-03-21 15:21:00 -07:00
committed by GitHub
parent 3e2fe536ad 7be1077216
commit 360fb2db0a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/test/test.c
View File

@ -5299,6 +5299,9 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN
static const char* caKeyFile = CERT_ROOT "ca-key.der"; static const char* caKeyFile = CERT_ROOT "ca-key.der";
static const char* caCertFile = CERT_ROOT "ca-cert.pem"; static const char* caCertFile = CERT_ROOT "ca-cert.pem";
#ifdef HAVE_ECC
static const char* eccCaKeyFile = CERT_ROOT "ecc-key.der";
#endif
#endif #endif
#endif /* !NO_RSA */ #endif /* !NO_RSA */
#ifndef NO_DH #ifndef NO_DH
@ -5327,9 +5330,7 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
#ifdef WOLFSSL_KEY_GEN #ifdef WOLFSSL_KEY_GEN
static const char* eccCaKeyPemFile = CERT_PREFIX "ecc-key.pem"; static const char* eccCaKeyPemFile = CERT_PREFIX "ecc-key.pem";
static const char* eccPubKeyDerFile = CERT_PREFIX "ecc-public-key.der"; static const char* eccPubKeyDerFile = CERT_PREFIX "ecc-public-key.der";
#endif static const char* eccCaKeyTempFile = CERT_PREFIX "ecc-key.der";
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN)
static const char* eccCaKeyFile = CERT_PREFIX "ecc-key.der";
#endif #endif
#if defined(WOLFSSL_CERT_GEN) || \ #if defined(WOLFSSL_CERT_GEN) || \
(defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT)) (defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT))
@ -9767,7 +9768,7 @@ static int ecc_test_key_gen(WC_RNG* rng, int keySize)
} }
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
keyFile = fopen(eccCaKeyFile, "wb"); keyFile = fopen(eccCaKeyTempFile, "wb");
if (!keyFile) { if (!keyFile) {
ERROR_OUT(-1025, done); ERROR_OUT(-1025, done);
} }