Added NO_WRITE_TEMP_FILES option to prevent writing temp files during wolfCrypt test.

This commit is contained in:
David Garske
2017-03-28 19:37:55 -07:00
parent 75abeaecfc
commit 36d9504bc3

View File

@@ -5324,6 +5324,7 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#endif /* !USE_CERT_BUFFER_* */ #endif /* !USE_CERT_BUFFER_* */
#ifndef NO_WRITE_TEMP_FILES
#ifdef HAVE_ECC #ifdef HAVE_ECC
/* Temporary Cert Files to be used in rsa cert gen test, is RSA enabled */ /* Temporary Cert Files to be used in rsa cert gen test, is RSA enabled */
#if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA) #if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
@@ -5360,7 +5361,7 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
static const char* certReqPemFile = CERT_PREFIX "certreq.pem"; static const char* certReqPemFile = CERT_PREFIX "certreq.pem";
#endif #endif
#endif /* !NO_RSA */ #endif /* !NO_RSA */
#endif /* !NO_WRITE_TEMP_FILES */
#endif /* !NO_FILESYSTEM */ #endif /* !NO_FILESYSTEM */
#ifndef NO_RSA #ifndef NO_RSA
@@ -6644,7 +6645,7 @@ int rsa_test(void)
int pemSz = 0; int pemSz = 0;
RsaKey derIn; RsaKey derIn;
RsaKey genKey; RsaKey genKey;
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
FILE* keyFile; FILE* keyFile;
FILE* pemFile; FILE* pemFile;
#endif #endif
@@ -6687,7 +6688,7 @@ int rsa_test(void)
return -302; return -302;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
keyFile = fopen(keyDerFile, "wb"); keyFile = fopen(keyDerFile, "wb");
if (!keyFile) { if (!keyFile) {
XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -6719,7 +6720,7 @@ int rsa_test(void)
return -304; return -304;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
pemFile = fopen(keyPemFile, "wb"); pemFile = fopen(keyPemFile, "wb");
if (!pemFile) { if (!pemFile) {
XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -6775,13 +6776,15 @@ int rsa_test(void)
Cert myCert; Cert myCert;
byte* derCert; byte* derCert;
byte* pem; byte* pem;
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
FILE* derFile; FILE* derFile;
FILE* pemFile; FILE* pemFile;
#endif
int certSz; int certSz;
int pemSz; int pemSz;
#ifdef WOLFSSL_TEST_CERT #ifdef WOLFSSL_TEST_CERT
DecodedCert decode; DecodedCert decode;
#endif #endif
derCert = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT, derCert = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
@@ -6868,7 +6871,7 @@ int rsa_test(void)
FreeDecodedCert(&decode); FreeDecodedCert(&decode);
#endif #endif
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
derFile = fopen(certDerFile, "wb"); derFile = fopen(certDerFile, "wb");
if (!derFile) { if (!derFile) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -6897,7 +6900,7 @@ int rsa_test(void)
return -404; return -404;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
pemFile = fopen(certPemFile, "wb"); pemFile = fopen(certPemFile, "wb");
if (!pemFile) { if (!pemFile) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -6926,8 +6929,10 @@ int rsa_test(void)
Cert myCert; Cert myCert;
byte* derCert; byte* derCert;
byte* pem; byte* pem;
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
FILE* derFile; FILE* derFile;
FILE* pemFile; FILE* pemFile;
#endif
int certSz; int certSz;
int pemSz; int pemSz;
size_t bytes3; size_t bytes3;
@@ -7102,7 +7107,7 @@ int rsa_test(void)
FreeDecodedCert(&decode); FreeDecodedCert(&decode);
#endif #endif
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
derFile = fopen(otherCertDerFile, "wb"); derFile = fopen(otherCertDerFile, "wb");
if (!derFile) { if (!derFile) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7122,6 +7127,7 @@ int rsa_test(void)
wc_FreeRng(&rng); wc_FreeRng(&rng);
return -416; return -416;
} }
#endif
pemSz = wc_DerToPem(derCert, certSz, pem, FOURK_BUF, CERT_TYPE); pemSz = wc_DerToPem(derCert, certSz, pem, FOURK_BUF, CERT_TYPE);
if (pemSz < 0) { if (pemSz < 0) {
@@ -7133,6 +7139,7 @@ int rsa_test(void)
return -411; return -411;
} }
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
pemFile = fopen(otherCertPemFile, "wb"); pemFile = fopen(otherCertPemFile, "wb");
if (!pemFile) { if (!pemFile) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7153,7 +7160,7 @@ int rsa_test(void)
return -415; return -415;
} }
fclose(pemFile); fclose(pemFile);
#endif /* !NO_FILESYSTEM */ #endif
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7166,8 +7173,10 @@ int rsa_test(void)
Cert myCert; Cert myCert;
byte* derCert; byte* derCert;
byte* pem; byte* pem;
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
FILE* derFile; FILE* derFile;
FILE* pemFile; FILE* pemFile;
#endif
int certSz; int certSz;
int pemSz; int pemSz;
size_t bytes3; size_t bytes3;
@@ -7348,7 +7357,7 @@ int rsa_test(void)
return -5408; return -5408;
} }
#ifdef WOLFSSL_TEST_CERT #ifdef WOLFSSL_TEST_CERT
InitDecodedCert(&decode, derCert, certSz, 0); InitDecodedCert(&decode, derCert, certSz, 0);
ret = ParseCert(&decode, CERT_TYPE, NO_VERIFY, 0); ret = ParseCert(&decode, CERT_TYPE, NO_VERIFY, 0);
if (ret != 0) { if (ret != 0) {
@@ -7360,8 +7369,9 @@ int rsa_test(void)
return -5409; return -5409;
} }
FreeDecodedCert(&decode); FreeDecodedCert(&decode);
#endif #endif
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
derFile = fopen(certEccDerFile, "wb"); derFile = fopen(certEccDerFile, "wb");
if (!derFile) { if (!derFile) {
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7381,6 +7391,7 @@ int rsa_test(void)
wc_FreeRng(&rng); wc_FreeRng(&rng);
return -5414; return -5414;
} }
#endif
pemSz = wc_DerToPem(derCert, certSz, pem, FOURK_BUF, CERT_TYPE); pemSz = wc_DerToPem(derCert, certSz, pem, FOURK_BUF, CERT_TYPE);
if (pemSz < 0) { if (pemSz < 0) {
@@ -7392,6 +7403,7 @@ int rsa_test(void)
return -5411; return -5411;
} }
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
pemFile = fopen(certEccPemFile, "wb"); pemFile = fopen(certEccPemFile, "wb");
if (!pemFile) { if (!pemFile) {
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7410,8 +7422,9 @@ int rsa_test(void)
wc_FreeRng(&rng); wc_FreeRng(&rng);
return -5415; return -5415;
} }
fclose(pemFile); fclose(pemFile);
#endif
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_ecc_free(&caKey); wc_ecc_free(&caKey);
@@ -7642,7 +7655,7 @@ int rsa_test(void)
FreeDecodedCert(&decode); FreeDecodedCert(&decode);
#endif #endif
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
derFile = fopen("./ntru-cert.der", "wb"); derFile = fopen("./ntru-cert.der", "wb");
if (!derFile) { if (!derFile) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7671,7 +7684,7 @@ int rsa_test(void)
return -460; return -460;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
pemFile = fopen("./ntru-cert.pem", "wb"); pemFile = fopen("./ntru-cert.pem", "wb");
if (!pemFile) { if (!pemFile) {
XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(derCert, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -7720,7 +7733,9 @@ int rsa_test(void)
byte* pem; byte* pem;
int derSz; int derSz;
int pemSz; int pemSz;
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
FILE* reqFile; FILE* reqFile;
#endif
der = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT,DYNAMIC_TYPE_TMP_BUFFER); der = (byte*)XMALLOC(FOURK_BUF, HEAP_HINT,DYNAMIC_TYPE_TMP_BUFFER);
if (der == NULL) { if (der == NULL) {
@@ -7799,7 +7814,7 @@ int rsa_test(void)
return -467; return -467;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
reqFile = fopen(certReqDerFile, "wb"); reqFile = fopen(certReqDerFile, "wb");
if (!reqFile) { if (!reqFile) {
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -8062,7 +8077,7 @@ int dsa_test(void)
int pemSz = 0; int pemSz = 0;
DsaKey derIn; DsaKey derIn;
DsaKey genKey; DsaKey genKey;
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
FILE* keyFile; FILE* keyFile;
FILE* pemFile; FILE* pemFile;
#endif #endif
@@ -8101,7 +8116,7 @@ int dsa_test(void)
return -366; return -366;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
keyFile = fopen(keyDerFile, "wb"); keyFile = fopen(keyDerFile, "wb");
if (!keyFile) { if (!keyFile) {
XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -8127,7 +8142,7 @@ int dsa_test(void)
return -369; return -369;
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
pemFile = fopen(keyPemFile, "wb"); pemFile = fopen(keyPemFile, "wb");
if (!pemFile) { if (!pemFile) {
XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@@ -9749,7 +9764,7 @@ static int ecc_test_key_gen(WC_RNG* rng, int keySize)
int derSz, pemSz; int derSz, pemSz;
byte der[FOURK_BUF]; byte der[FOURK_BUF];
byte pem[FOURK_BUF]; byte pem[FOURK_BUF];
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
FILE* keyFile; FILE* keyFile;
FILE* pemFile; FILE* pemFile;
#endif #endif
@@ -9771,7 +9786,7 @@ static int ecc_test_key_gen(WC_RNG* rng, int keySize)
ERROR_OUT(derSz, done); ERROR_OUT(derSz, done);
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
keyFile = fopen(eccCaKeyTempFile, "wb"); keyFile = fopen(eccCaKeyTempFile, "wb");
if (!keyFile) { if (!keyFile) {
ERROR_OUT(-1025, done); ERROR_OUT(-1025, done);
@@ -9788,7 +9803,7 @@ static int ecc_test_key_gen(WC_RNG* rng, int keySize)
ERROR_OUT(pemSz, done); ERROR_OUT(pemSz, done);
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
pemFile = fopen(eccCaKeyPemFile, "wb"); pemFile = fopen(eccCaKeyPemFile, "wb");
if (!pemFile) { if (!pemFile) {
ERROR_OUT(-1028, done); ERROR_OUT(-1028, done);
@@ -9809,7 +9824,7 @@ static int ecc_test_key_gen(WC_RNG* rng, int keySize)
ERROR_OUT(-5416, done); ERROR_OUT(-5416, done);
} }
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
keyFile = fopen(eccPubKeyDerFile, "wb"); keyFile = fopen(eccPubKeyDerFile, "wb");
if (!keyFile) { if (!keyFile) {
ERROR_OUT(-5417, done); ERROR_OUT(-5417, done);