From 3483816f9f6e71e11843939534758e33a1847a09 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Wed, 31 Dec 2014 11:00:38 -0700 Subject: [PATCH] fix to test.c and asthetics fo asn_public.h --- cyassl/ctaocrypt/asn_public.h | 164 ++++++++++++++++++---------------- wolfcrypt/test/test.c | 52 +++++------ 2 files changed, 112 insertions(+), 104 deletions(-) diff --git a/cyassl/ctaocrypt/asn_public.h b/cyassl/ctaocrypt/asn_public.h index ce7d1f789..63d3d607e 100644 --- a/cyassl/ctaocrypt/asn_public.h +++ b/cyassl/ctaocrypt/asn_public.h @@ -32,85 +32,93 @@ #include #ifndef HAVE_FIPS -#ifdef WOLFSSL_CERT_GEN -#define InitCert wc_InitCert -#define MakeCert wc_MakeCert -#ifdef WOLFSSL_CERT_REQ -#define MakeCertReq wc_MakeCertReq -#endif -#define SignCert wc_SignCert -#define MakeSelfCert wc_MakeSelfCert -#define SetIssuer wc_SetIssuer -#define SetSubject wc_SetSubject -#ifdef WOLFSSL_ALT_NAMES -#define SetAltNames wc_SetAltNames -#endif -#define SetIssuerBuffer wc_SetIssuerBuffer -#define SetSubjectBuffer wc_SetSubjectBuffer -#define SetAltNamesBuffer wc_SetAltNamesBuffer -#define SetDatesBuffer wc_SetDatesBuffer - - #ifdef HAVE_NTRU -#define MakeNtruCert wc_MakeNtruCert - #endif - -#endif /* WOLFSSL_CERT_GEN */ -#if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) -#define DerToPem wc_DerToPem -#endif - -#ifdef HAVE_ECC - /* private key helpers */ -#define EccPrivateKeyDecode wc_EccPrivateKeyDecode -#define EccKeyToDer wc_EccKeyToDer -#endif - -/* DER encode signature */ -#define EncodeSignature wc_EncodeSignature -#define GetCTC_HashOID wc_GetCTC_HashOID - + #ifdef WOLFSSL_CERT_GEN + #define InitCert wc_InitCert + #define MakeCert wc_MakeCert + + #ifdef WOLFSSL_CERT_REQ + #define MakeCertReq wc_MakeCertReq + #endif + + #define SignCert wc_SignCert + #define MakeSelfCert wc_MakeSelfCert + #define SetIssuer wc_SetIssuer + #define SetSubject wc_SetSubject + + #ifdef WOLFSSL_ALT_NAMES + #define SetAltNames wc_SetAltNames + #endif + + #define SetIssuerBuffer wc_SetIssuerBuffer + #define SetSubjectBuffer wc_SetSubjectBuffer + #define SetAltNamesBuffer wc_SetAltNamesBuffer + #define SetDatesBuffer wc_SetDatesBuffer + + #ifdef HAVE_NTRU + #define MakeNtruCert wc_MakeNtruCert + #endif + + #endif /* WOLFSSL_CERT_GEN */ + + #if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) + #define DerToPem wc_DerToPem + #endif + + #ifdef HAVE_ECC + /* private key helpers */ + #define EccPrivateKeyDecode wc_EccPrivateKeyDecode + #define EccKeyToDer wc_EccKeyToDer + #endif + + /* DER encode signature */ + #define EncodeSignature wc_EncodeSignature + #define GetCTC_HashOID wc_GetCTC_HashOID #else - -#define WOLFSSL_CERT_GEN CYASSL_CERTGEN -#define WOLFSSL_CERT_REQ CYASSL_CERT_REQ -#define WOLFSSL_ALT_NAMES CYASSL_ALT_NAMES - -#ifdef WOLFSSL_CERT_GEN -#define wc_InitCert InitCert -#define wc_MakeCert MakeCert -#ifdef WOLFSSL_CERT_REQ -#define wc_MakeCertReq MakeCertReq -#endif -#define wc_SignCert SignCert -#define wc_MakeSelfCert MakeSelfCert -#define wc_SetIssuer SetIssuer -#define wc_SetSubject SetSubject -#ifdef WOLFSSL_ALT_NAMES -#define wc_SetAltNames SetAltNames -#endif -#define wc_SetIssuerBuffer SetIssuerBuffer -#define wc_SetSubjectBuffer SetSubjectBuffer -#define wc_SetAltNamesBuffer SetAltNamesBuffer -#define wc_SetDatesBuffer SetDatesBuffer - - #ifdef HAVE_NTRU -#define wc_MakeNtruCert MakeNtruCert - #endif - -#endif /* WOLFSSL_CERT_GEN */ -#if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) -#define wc_DerToPem DerToPem -#endif - -#ifdef HAVE_ECC - /* private key helpers */ -#define wc_EccPrivateKeyDecode EccPrivateKeyDecode -#define wc_EccKeyToDer EccKeyToDer -#endif - -/* DER encode signature */ -#define wc_EncodeSignature EncodeSignature -#define wc_GetCTC_HashOID GetCTC_HashOID + #define WOLFSSL_CERT_GEN CYASSL_CERTGEN + #define WOLFSSL_CERT_REQ CYASSL_CERT_REQ + #define WOLFSSL_ALT_NAMES CYASSL_ALT_NAMES + + #ifdef WOLFSSL_CERT_GEN + #define wc_InitCert InitCert + #define wc_MakeCert MakeCert + + #ifdef WOLFSSL_CERT_REQ + #define wc_MakeCertReq MakeCertReq + #endif + + #define wc_SignCert SignCert + #define wc_MakeSelfCert MakeSelfCert + #define wc_SetIssuer SetIssuer + #define wc_SetSubject SetSubject + + #ifdef WOLFSSL_ALT_NAMES + #define wc_SetAltNames SetAltNames + #endif + + #define wc_SetIssuerBuffer SetIssuerBuffer + #define wc_SetSubjectBuffer SetSubjectBuffer + #define wc_SetAltNamesBuffer SetAltNamesBuffer + #define wc_SetDatesBuffer SetDatesBuffer + + #ifdef HAVE_NTRU + #define wc_MakeNtruCert MakeNtruCert + #endif + + #endif /* WOLFSSL_CERT_GEN */ + + #if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) + #define wc_DerToPem DerToPem + #endif + + #ifdef HAVE_ECC + /* private key helpers */ + #define wc_EccPrivateKeyDecode EccPrivateKeyDecode + #define wc_EccKeyToDer EccKeyToDer + #endif + + /* DER encode signature */ + #define wc_EncodeSignature EncodeSignature + #define wc_GetCTC_HashOID GetCTC_HashOID #endif /* HAVE_FIPS */ #endif /* CTA_CRYPT_ASN_PUBLIC_H */ diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 1d45ac4c4..36a25d156 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -3239,7 +3239,7 @@ int rsa_test(void) return -310; } - InitCert(&myCert); + wc_InitCert(&myCert); strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); strncpy(myCert.subject.state, "OR", CTC_NAME_SIZE); @@ -3251,7 +3251,7 @@ int rsa_test(void) myCert.isCA = 1; myCert.sigType = CTC_SHA256wRSA; - certSz = MakeSelfCert(&myCert, derCert, FOURK_BUF, &key, &rng); + certSz = wc_MakeSelfCert(&myCert, derCert, FOURK_BUF, &key, &rng); if (certSz < 0) { free(derCert); free(pem); @@ -3356,7 +3356,7 @@ int rsa_test(void) return -413; } - InitCert(&myCert); + wc_InitCert(&myCert); strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); strncpy(myCert.subject.state, "OR", CTC_NAME_SIZE); @@ -3366,7 +3366,7 @@ int rsa_test(void) strncpy(myCert.subject.commonName, "www.yassl.com", CTC_NAME_SIZE); strncpy(myCert.subject.email, "info@yassl.com", CTC_NAME_SIZE); - ret = SetIssuer(&myCert, caCertFile); + ret = wc_SetIssuer(&myCert, caCertFile); if (ret < 0) { free(derCert); free(pem); @@ -3374,7 +3374,7 @@ int rsa_test(void) return -405; } - certSz = MakeCert(&myCert, derCert, FOURK_BUF, &key, NULL, &rng); + certSz = wc_MakeCert(&myCert, derCert, FOURK_BUF, &key, NULL, &rng); if (certSz < 0) { free(derCert); free(pem); @@ -3382,7 +3382,7 @@ int rsa_test(void) return -407; } - certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, + certSz = wc_SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, &caKey, NULL, &rng); if (certSz < 0) { free(derCert); @@ -3486,14 +3486,14 @@ int rsa_test(void) fclose(file3); wc_ecc_init(&caKey); - ret = EccPrivateKeyDecode(tmp, &idx3, &caKey, (word32)bytes3); + ret = wc_EccPrivateKeyDecode(tmp, &idx3, &caKey, (word32)bytes3); if (ret != 0) { free(derCert); free(pem); return -5413; } - InitCert(&myCert); + wc_InitCert(&myCert); myCert.sigType = CTC_SHA256wECDSA; strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); @@ -3504,28 +3504,28 @@ int rsa_test(void) strncpy(myCert.subject.commonName, "www.wolfssl.com", CTC_NAME_SIZE); strncpy(myCert.subject.email, "info@wolfssl.com", CTC_NAME_SIZE); - ret = SetIssuer(&myCert, eccCaCertFile); + ret = wc_SetIssuer(&myCert, eccCaCertFile); if (ret < 0) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5405; } - certSz = MakeCert(&myCert, derCert, FOURK_BUF, NULL, &caKey, &rng); + certSz = wc_MakeCert(&myCert, derCert, FOURK_BUF, NULL, &caKey, &rng); if (certSz < 0) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5407; } - certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, + certSz = wc_SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, NULL, &caKey, &rng); if (certSz < 0) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5408; } @@ -3535,7 +3535,7 @@ int rsa_test(void) if (ret != 0) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5409; } FreeDecodedCert(&decode); @@ -3545,7 +3545,7 @@ int rsa_test(void) if (!derFile) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5410; } ret = (int)fwrite(derCert, 1, certSz, derFile); @@ -3553,7 +3553,7 @@ int rsa_test(void) if (ret != certSz) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5414; } @@ -3561,7 +3561,7 @@ int rsa_test(void) if (pemSz < 0) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5411; } @@ -3569,14 +3569,14 @@ int rsa_test(void) if (!pemFile) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5412; } ret = (int)fwrite(pem, 1, pemSz, pemFile); if (ret != pemSz) { free(pem); free(derCert); - ecc_free(&caKey); + wc_ecc_free(&caKey); return -5415; } fclose(pemFile); @@ -3676,7 +3676,7 @@ int rsa_test(void) return -454; } - InitCert(&myCert); + wc_InitCert(&myCert); strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); strncpy(myCert.subject.state, "OR", CTC_NAME_SIZE); @@ -3686,7 +3686,7 @@ int rsa_test(void) strncpy(myCert.subject.commonName, "www.yassl.com", CTC_NAME_SIZE); strncpy(myCert.subject.email, "info@yassl.com", CTC_NAME_SIZE); - ret = SetIssuer(&myCert, caCertFile); + ret = wc_SetIssuer(&myCert, caCertFile); if (ret < 0) { free(derCert); free(pem); @@ -3703,7 +3703,7 @@ int rsa_test(void) return -456; } - certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, + certSz = wc_SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, &caKey, NULL, &rng); FreeRsaKey(&caKey); if (certSz < 0) { @@ -3793,7 +3793,7 @@ int rsa_test(void) return -464; } - InitCert(&req); + wc_InitCert(&req); req.version = 0; req.isCA = 1; @@ -3807,14 +3807,14 @@ int rsa_test(void) strncpy(req.subject.email, "info@yassl.com", CTC_NAME_SIZE); req.sigType = CTC_SHA256wRSA; - derSz = MakeCertReq(&req, der, FOURK_BUF, &key, NULL); + derSz = wc_MakeCertReq(&req, der, FOURK_BUF, &key, NULL); if (derSz < 0) { free(pem); free(der); return -465; } - derSz = SignCert(req.bodySz, req.sigType, der, FOURK_BUF, + derSz = wc_SignCert(req.bodySz, req.sigType, der, FOURK_BUF, &key, NULL, &rng); if (derSz < 0) { free(pem);