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

fix to test.c and asthetics fo asn_public.h

Browse Source
This commit is contained in:
Jacob Barthelmeh
2014-12-31 11:00:38 -07:00
parent 78e7ffdfa9
commit 3483816f9f
2 changed files with 112 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
cyassl/ctaocrypt/asn_public.h
View File

@ -32,85 +32,93 @@
#include <wolfssl/wolfcrypt/asn_public.h> #include <wolfssl/wolfcrypt/asn_public.h>
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN
#define InitCert wc_InitCert #define InitCert wc_InitCert
#define MakeCert wc_MakeCert #define MakeCert wc_MakeCert
#ifdef WOLFSSL_CERT_REQ
#define MakeCertReq wc_MakeCertReq #ifdef WOLFSSL_CERT_REQ
#endif #define MakeCertReq wc_MakeCertReq
#define SignCert wc_SignCert #endif
#define MakeSelfCert wc_MakeSelfCert
#define SetIssuer wc_SetIssuer #define SignCert wc_SignCert
#define SetSubject wc_SetSubject #define MakeSelfCert wc_MakeSelfCert
#ifdef WOLFSSL_ALT_NAMES #define SetIssuer wc_SetIssuer
#define SetAltNames wc_SetAltNames #define SetSubject wc_SetSubject
#endif
#define SetIssuerBuffer wc_SetIssuerBuffer #ifdef WOLFSSL_ALT_NAMES
#define SetSubjectBuffer wc_SetSubjectBuffer #define SetAltNames wc_SetAltNames
#define SetAltNamesBuffer wc_SetAltNamesBuffer #endif
#define SetDatesBuffer wc_SetDatesBuffer
#define SetIssuerBuffer wc_SetIssuerBuffer
#ifdef HAVE_NTRU #define SetSubjectBuffer wc_SetSubjectBuffer
#define MakeNtruCert wc_MakeNtruCert #define SetAltNamesBuffer wc_SetAltNamesBuffer
#endif #define SetDatesBuffer wc_SetDatesBuffer
#endif /* WOLFSSL_CERT_GEN */ #ifdef HAVE_NTRU
#if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) #define MakeNtruCert wc_MakeNtruCert
#define DerToPem wc_DerToPem #endif
#endif
#endif /* WOLFSSL_CERT_GEN */
#ifdef HAVE_ECC
/* private key helpers */ #if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN)
#define EccPrivateKeyDecode wc_EccPrivateKeyDecode #define DerToPem wc_DerToPem
#define EccKeyToDer wc_EccKeyToDer #endif
#endif
#ifdef HAVE_ECC
/* DER encode signature */ /* private key helpers */
#define EncodeSignature wc_EncodeSignature #define EccPrivateKeyDecode wc_EccPrivateKeyDecode
#define GetCTC_HashOID wc_GetCTC_HashOID #define EccKeyToDer wc_EccKeyToDer
#endif
/* DER encode signature */
#define EncodeSignature wc_EncodeSignature
#define GetCTC_HashOID wc_GetCTC_HashOID
#else #else
#define WOLFSSL_CERT_GEN CYASSL_CERTGEN
#define WOLFSSL_CERT_GEN CYASSL_CERTGEN #define WOLFSSL_CERT_REQ CYASSL_CERT_REQ
#define WOLFSSL_CERT_REQ CYASSL_CERT_REQ #define WOLFSSL_ALT_NAMES CYASSL_ALT_NAMES
#define WOLFSSL_ALT_NAMES CYASSL_ALT_NAMES
#ifdef WOLFSSL_CERT_GEN
#ifdef WOLFSSL_CERT_GEN #define wc_InitCert InitCert
#define wc_InitCert InitCert #define wc_MakeCert MakeCert
#define wc_MakeCert MakeCert
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
#define wc_MakeCertReq MakeCertReq #define wc_MakeCertReq MakeCertReq
#endif #endif
#define wc_SignCert SignCert
#define wc_MakeSelfCert MakeSelfCert #define wc_SignCert SignCert
#define wc_SetIssuer SetIssuer #define wc_MakeSelfCert MakeSelfCert
#define wc_SetSubject SetSubject #define wc_SetIssuer SetIssuer
#ifdef WOLFSSL_ALT_NAMES #define wc_SetSubject SetSubject
#define wc_SetAltNames SetAltNames
#endif #ifdef WOLFSSL_ALT_NAMES
#define wc_SetIssuerBuffer SetIssuerBuffer #define wc_SetAltNames SetAltNames
#define wc_SetSubjectBuffer SetSubjectBuffer #endif
#define wc_SetAltNamesBuffer SetAltNamesBuffer
#define wc_SetDatesBuffer SetDatesBuffer #define wc_SetIssuerBuffer SetIssuerBuffer
#define wc_SetSubjectBuffer SetSubjectBuffer
#ifdef HAVE_NTRU #define wc_SetAltNamesBuffer SetAltNamesBuffer
#define wc_MakeNtruCert MakeNtruCert #define wc_SetDatesBuffer SetDatesBuffer
#endif
#ifdef HAVE_NTRU
#endif /* WOLFSSL_CERT_GEN */ #define wc_MakeNtruCert MakeNtruCert
#if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) #endif
#define wc_DerToPem DerToPem
#endif #endif /* WOLFSSL_CERT_GEN */
#ifdef HAVE_ECC #if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN)
/* private key helpers */ #define wc_DerToPem DerToPem
#define wc_EccPrivateKeyDecode EccPrivateKeyDecode #endif
#define wc_EccKeyToDer EccKeyToDer
#endif #ifdef HAVE_ECC
/* private key helpers */
/* DER encode signature */ #define wc_EccPrivateKeyDecode EccPrivateKeyDecode
#define wc_EncodeSignature EncodeSignature #define wc_EccKeyToDer EccKeyToDer
#define wc_GetCTC_HashOID GetCTC_HashOID #endif
/* DER encode signature */
#define wc_EncodeSignature EncodeSignature
#define wc_GetCTC_HashOID GetCTC_HashOID
#endif /* HAVE_FIPS */ #endif /* HAVE_FIPS */
#endif /* CTA_CRYPT_ASN_PUBLIC_H */ #endif /* CTA_CRYPT_ASN_PUBLIC_H */

52
wolfcrypt/test/test.c
View File

@ -3239,7 +3239,7 @@ int rsa_test(void)
return -310; return -310;
} }
InitCert(&myCert); wc_InitCert(&myCert);
strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); strncpy(myCert.subject.country, "US", CTC_NAME_SIZE);
strncpy(myCert.subject.state, "OR", CTC_NAME_SIZE); strncpy(myCert.subject.state, "OR", CTC_NAME_SIZE);
@ -3251,7 +3251,7 @@ int rsa_test(void)
myCert.isCA = 1; myCert.isCA = 1;
myCert.sigType = CTC_SHA256wRSA; myCert.sigType = CTC_SHA256wRSA;
certSz = MakeSelfCert(&myCert, derCert, FOURK_BUF, &key, &rng); certSz = wc_MakeSelfCert(&myCert, derCert, FOURK_BUF, &key, &rng);
if (certSz < 0) { if (certSz < 0) {
free(derCert); free(derCert);
free(pem); free(pem);
@ -3356,7 +3356,7 @@ int rsa_test(void)
return -413; return -413;
} }
InitCert(&myCert); wc_InitCert(&myCert);
strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); strncpy(myCert.subject.country, "US", CTC_NAME_SIZE);
strncpy(myCert.subject.state, "OR", 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.commonName, "www.yassl.com", CTC_NAME_SIZE);
strncpy(myCert.subject.email, "info@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) { if (ret < 0) {
free(derCert); free(derCert);
free(pem); free(pem);
@ -3374,7 +3374,7 @@ int rsa_test(void)
return -405; return -405;
} }
certSz = MakeCert(&myCert, derCert, FOURK_BUF, &key, NULL, &rng); certSz = wc_MakeCert(&myCert, derCert, FOURK_BUF, &key, NULL, &rng);
if (certSz < 0) { if (certSz < 0) {
free(derCert); free(derCert);
free(pem); free(pem);
@ -3382,7 +3382,7 @@ int rsa_test(void)
return -407; return -407;
} }
certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, certSz = wc_SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
&caKey, NULL, &rng); &caKey, NULL, &rng);
if (certSz < 0) { if (certSz < 0) {
free(derCert); free(derCert);
@ -3486,14 +3486,14 @@ int rsa_test(void)
fclose(file3); fclose(file3);
wc_ecc_init(&caKey); wc_ecc_init(&caKey);
ret = EccPrivateKeyDecode(tmp, &idx3, &caKey, (word32)bytes3); ret = wc_EccPrivateKeyDecode(tmp, &idx3, &caKey, (word32)bytes3);
if (ret != 0) { if (ret != 0) {
free(derCert); free(derCert);
free(pem); free(pem);
return -5413; return -5413;
} }
InitCert(&myCert); wc_InitCert(&myCert);
myCert.sigType = CTC_SHA256wECDSA; myCert.sigType = CTC_SHA256wECDSA;
strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); 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.commonName, "www.wolfssl.com", CTC_NAME_SIZE);
strncpy(myCert.subject.email, "info@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) { if (ret < 0) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5405; return -5405;
} }
certSz = MakeCert(&myCert, derCert, FOURK_BUF, NULL, &caKey, &rng); certSz = wc_MakeCert(&myCert, derCert, FOURK_BUF, NULL, &caKey, &rng);
if (certSz < 0) { if (certSz < 0) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5407; return -5407;
} }
certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, certSz = wc_SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
NULL, &caKey, &rng); NULL, &caKey, &rng);
if (certSz < 0) { if (certSz < 0) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5408; return -5408;
} }
@ -3535,7 +3535,7 @@ int rsa_test(void)
if (ret != 0) { if (ret != 0) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5409; return -5409;
} }
FreeDecodedCert(&decode); FreeDecodedCert(&decode);
@ -3545,7 +3545,7 @@ int rsa_test(void)
if (!derFile) { if (!derFile) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5410; return -5410;
} }
ret = (int)fwrite(derCert, 1, certSz, derFile); ret = (int)fwrite(derCert, 1, certSz, derFile);
@ -3553,7 +3553,7 @@ int rsa_test(void)
if (ret != certSz) { if (ret != certSz) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5414; return -5414;
} }
@ -3561,7 +3561,7 @@ int rsa_test(void)
if (pemSz < 0) { if (pemSz < 0) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5411; return -5411;
} }
@ -3569,14 +3569,14 @@ int rsa_test(void)
if (!pemFile) { if (!pemFile) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5412; return -5412;
} }
ret = (int)fwrite(pem, 1, pemSz, pemFile); ret = (int)fwrite(pem, 1, pemSz, pemFile);
if (ret != pemSz) { if (ret != pemSz) {
free(pem); free(pem);
free(derCert); free(derCert);
ecc_free(&caKey); wc_ecc_free(&caKey);
return -5415; return -5415;
} }
fclose(pemFile); fclose(pemFile);
@ -3676,7 +3676,7 @@ int rsa_test(void)
return -454; return -454;
} }
InitCert(&myCert); wc_InitCert(&myCert);
strncpy(myCert.subject.country, "US", CTC_NAME_SIZE); strncpy(myCert.subject.country, "US", CTC_NAME_SIZE);
strncpy(myCert.subject.state, "OR", 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.commonName, "www.yassl.com", CTC_NAME_SIZE);
strncpy(myCert.subject.email, "info@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) { if (ret < 0) {
free(derCert); free(derCert);
free(pem); free(pem);
@ -3703,7 +3703,7 @@ int rsa_test(void)
return -456; return -456;
} }
certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF, certSz = wc_SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
&caKey, NULL, &rng); &caKey, NULL, &rng);
FreeRsaKey(&caKey); FreeRsaKey(&caKey);
if (certSz < 0) { if (certSz < 0) {
@ -3793,7 +3793,7 @@ int rsa_test(void)
return -464; return -464;
} }
InitCert(&req); wc_InitCert(&req);
req.version = 0; req.version = 0;
req.isCA = 1; req.isCA = 1;
@ -3807,14 +3807,14 @@ int rsa_test(void)
strncpy(req.subject.email, "info@yassl.com", CTC_NAME_SIZE); strncpy(req.subject.email, "info@yassl.com", CTC_NAME_SIZE);
req.sigType = CTC_SHA256wRSA; req.sigType = CTC_SHA256wRSA;
derSz = MakeCertReq(&req, der, FOURK_BUF, &key, NULL); derSz = wc_MakeCertReq(&req, der, FOURK_BUF, &key, NULL);
if (derSz < 0) { if (derSz < 0) {
free(pem); free(pem);
free(der); free(der);
return -465; return -465;
} }
derSz = SignCert(req.bodySz, req.sigType, der, FOURK_BUF, derSz = wc_SignCert(req.bodySz, req.sigType, der, FOURK_BUF,
&key, NULL, &rng); &key, NULL, &rng);
if (derSz < 0) { if (derSz < 0) {
free(pem); free(pem);