From 5edcf685ca936f11b26095120ef80bab7229ee5a Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Mon, 10 Apr 2017 10:38:16 +1000 Subject: [PATCH] Rename caCertFile --- wolfcrypt/test/test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 15c5a6783..ee48db921 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -5325,8 +5325,8 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out) static const char* clientKeyPub = CERT_ROOT "client-keyPub.der"; #endif #ifdef WOLFSSL_CERT_GEN - static const char* caKeyFile = CERT_ROOT "ca-key.der"; - static const char* caCertFile = CERT_ROOT "ca-cert.pem"; + static const char* rsaCaKeyFile = CERT_ROOT "ca-key.der"; + static const char* rsaCaCertFile = CERT_ROOT "ca-cert.pem"; #endif #endif /* !NO_RSA */ #ifndef NO_DH @@ -6993,7 +6993,7 @@ int rsa_test(void) XMEMCPY(tmp, ca_key_der_2048, sizeof_ca_key_der_2048); bytes3 = sizeof_ca_key_der_2048; #else - file3 = fopen(caKeyFile, "rb"); + file3 = fopen(rsaCaKeyFile, "rb"); if (!file3) { XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -7061,7 +7061,7 @@ int rsa_test(void) ret = wc_SetAuthKeyIdFromCert(&myCert, ca_cert_der_1024, sizeof_ca_cert_der_1024); #else - ret = wc_SetAuthKeyId(&myCert, caCertFile); + ret = wc_SetAuthKeyId(&myCert, rsaCaCertFile); #endif if (ret != 0) { XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -7088,7 +7088,7 @@ int rsa_test(void) ret = wc_SetIssuerBuffer(&myCert, ca_cert_der_1024, sizeof_ca_cert_der_1024); #else - ret = wc_SetIssuer(&myCert, caCertFile); + ret = wc_SetIssuer(&myCert, rsaCaCertFile); #endif if (ret < 0) { XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -7547,7 +7547,7 @@ int rsa_test(void) XMEMCPY(tmp, ca_key_der_2048, sizeof_ca_key_der_2048); bytes = sizeof_ca_key_der_2048; #else - caFile = fopen(caKeyFile, "rb"); + caFile = fopen(rsaCaKeyFile, "rb"); if (!caFile) { XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -7607,7 +7607,7 @@ int rsa_test(void) ret = wc_SetAuthKeyIdFromCert(&myCert, ca_cert_der_1024, sizeof_ca_cert_der_1024); #else - ret = wc_SetAuthKeyId(&myCert, caCertFile); + ret = wc_SetAuthKeyId(&myCert, rsaCaCertFile); #endif if (ret != 0) { XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -7635,7 +7635,7 @@ int rsa_test(void) ret = wc_SetIssuerBuffer(&myCert, ca_cert_der_1024, sizeof_ca_cert_der_1024); #else - ret = wc_SetIssuer(&myCert, caCertFile); + ret = wc_SetIssuer(&myCert, rsaCaCertFile); #endif if (ret < 0) { XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);