wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #845 from SparkiDev/cert_file

Browse Source 
Rename caCertFile
This commit is contained in:
toddouska
2017-04-12 13:55:56 -07:00
committed by GitHub
parent 4f7b27fc88 5edcf685ca
commit e1a53a6c36
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wolfcrypt/test/test.c
View File

@@ -5274,8 +5274,8 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
static const char* clientKeyPub = CERT_ROOT "client-keyPub.der"; static const char* clientKeyPub = CERT_ROOT "client-keyPub.der";
#endif #endif
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN
static const char* caKeyFile = CERT_ROOT "ca-key.der"; static const char* rsaCaKeyFile = CERT_ROOT "ca-key.der";
static const char* caCertFile = CERT_ROOT "ca-cert.pem"; static const char* rsaCaCertFile = CERT_ROOT "ca-cert.pem";
#endif #endif
#endif /* !NO_RSA */ #endif /* !NO_RSA */
#ifndef NO_DH #ifndef NO_DH
@@ -6963,7 +6963,7 @@ int rsa_test(void)
XMEMCPY(tmp, ca_key_der_2048, sizeof_ca_key_der_2048); XMEMCPY(tmp, ca_key_der_2048, sizeof_ca_key_der_2048);
bytes3 = sizeof_ca_key_der_2048; bytes3 = sizeof_ca_key_der_2048;
#else #else
file3 = fopen(caKeyFile, "rb"); file3 = fopen(rsaCaKeyFile, "rb");
if (!file3) { if (!file3) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7031,7 +7031,7 @@ int rsa_test(void)
ret = wc_SetAuthKeyIdFromCert(&myCert, ca_cert_der_1024, ret = wc_SetAuthKeyIdFromCert(&myCert, ca_cert_der_1024,
sizeof_ca_cert_der_1024); sizeof_ca_cert_der_1024);
#else #else
ret = wc_SetAuthKeyId(&myCert, caCertFile); ret = wc_SetAuthKeyId(&myCert, rsaCaCertFile);
#endif #endif
if (ret != 0) { if (ret != 0) {
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7058,7 +7058,7 @@ int rsa_test(void)
ret = wc_SetIssuerBuffer(&myCert, ca_cert_der_1024, ret = wc_SetIssuerBuffer(&myCert, ca_cert_der_1024,
sizeof_ca_cert_der_1024); sizeof_ca_cert_der_1024);
#else #else
ret = wc_SetIssuer(&myCert, caCertFile); ret = wc_SetIssuer(&myCert, rsaCaCertFile);
#endif #endif
if (ret < 0) { if (ret < 0) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7535,7 +7535,7 @@ int rsa_test(void)
XMEMCPY(tmp, ca_key_der_2048, sizeof_ca_key_der_2048); XMEMCPY(tmp, ca_key_der_2048, sizeof_ca_key_der_2048);
bytes = sizeof_ca_key_der_2048; bytes = sizeof_ca_key_der_2048;
#else #else
caFile = fopen(caKeyFile, "rb"); caFile = fopen(rsaCaKeyFile, "rb");
if (!caFile) { if (!caFile) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7595,7 +7595,7 @@ int rsa_test(void)
ret = wc_SetAuthKeyIdFromCert(&myCert, ca_cert_der_1024, ret = wc_SetAuthKeyIdFromCert(&myCert, ca_cert_der_1024,
sizeof_ca_cert_der_1024); sizeof_ca_cert_der_1024);
#else #else
ret = wc_SetAuthKeyId(&myCert, caCertFile); ret = wc_SetAuthKeyId(&myCert, rsaCaCertFile);
#endif #endif
if (ret != 0) { if (ret != 0) {
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7623,7 +7623,7 @@ int rsa_test(void)
ret = wc_SetIssuerBuffer(&myCert, ca_cert_der_1024, ret = wc_SetIssuerBuffer(&myCert, ca_cert_der_1024,
sizeof_ca_cert_der_1024); sizeof_ca_cert_der_1024);
#else #else
ret = wc_SetIssuer(&myCert, caCertFile); ret = wc_SetIssuer(&myCert, rsaCaCertFile);
#endif #endif
if (ret < 0) { if (ret < 0) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);