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

more macro guards to reduce size

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-03-20 17:15:16 -06:00
parent 4d65e4cc1e
commit 087df8f1cd
4 changed files with 80 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -162,8 +162,10 @@ int IsAtLeastTLSv1_2(const WOLFSSL* ssl)
{ {
if (ssl->version.major == SSLv3_MAJOR && ssl->version.minor >=TLSv1_2_MINOR) if (ssl->version.major == SSLv3_MAJOR && ssl->version.minor >=TLSv1_2_MINOR)
return 1; return 1;
#ifdef WOLFSSL_DTLS
if (ssl->version.major == DTLS_MAJOR && ssl->version.minor <= DTLSv1_2_MINOR) if (ssl->version.major == DTLS_MAJOR && ssl->version.minor <= DTLSv1_2_MINOR)
return 1; return 1;
#endif
return 0; return 0;
} }

60
wolfcrypt/src/asn.c
View File

@@ -2388,10 +2388,14 @@ static int CheckAlgo(int first, int second, int* id, int* version)
if (first == 1) { if (first == 1) {
switch (second) { switch (second) {
#if !defined(NO_SHA)
#ifndef NO_RC4
case PBE_SHA1_RC4_128: case PBE_SHA1_RC4_128:
*id = PBE_SHA1_RC4_128; *id = PBE_SHA1_RC4_128;
*version = PKCS12v1; *version = PKCS12v1;
return 0; return 0;
#endif
#ifndef NO_DES3
case PBE_SHA1_DES: case PBE_SHA1_DES:
*id = PBE_SHA1_DES; *id = PBE_SHA1_DES;
*version = PKCS12v1; *version = PKCS12v1;
@@ -2400,6 +2404,8 @@ static int CheckAlgo(int first, int second, int* id, int* version)
*id = PBE_SHA1_DES3; *id = PBE_SHA1_DES3;
*version = PKCS12v1; *version = PKCS12v1;
return 0; return 0;
#endif
#endif /* !NO_SHA */
default: default:
return ALGO_ID_E; return ALGO_ID_E;
} }
@@ -2414,12 +2420,18 @@ static int CheckAlgo(int first, int second, int* id, int* version)
} }
switch (second) { switch (second) {
#ifndef NO_DES3
#ifndef NO_MD5
case 3: /* see RFC 2898 for ids */ case 3: /* see RFC 2898 for ids */
*id = PBE_MD5_DES; *id = PBE_MD5_DES;
return 0; return 0;
#endif
#ifndef NO_SHA
case 10: case 10:
*id = PBE_SHA1_DES; *id = PBE_SHA1_DES;
return 0; return 0;
#endif
#endif /* !NO_DES3 */
default: default:
return ALGO_ID_E; return ALGO_ID_E;
@@ -2433,7 +2445,7 @@ static int CheckAlgoV2(int oid, int* id)
{ {
(void)id; /* not used if AES and DES3 disabled */ (void)id; /* not used if AES and DES3 disabled */
switch (oid) { switch (oid) {
#ifndef NO_DES3 #if !defined(NO_DES3) && !defined(NO_SHA)
case DESb: case DESb:
*id = PBE_SHA1_DES; *id = PBE_SHA1_DES;
return 0; return 0;
@@ -2477,11 +2489,14 @@ static int CryptKey(const char* password, int passwordSz, byte* salt,
WOLFSSL_ENTER("CryptKey()"); WOLFSSL_ENTER("CryptKey()");
switch (id) { switch (id) {
#ifndef NO_DES3
#ifndef NO_MD5
case PBE_MD5_DES: case PBE_MD5_DES:
typeH = WC_MD5; typeH = WC_MD5;
derivedLen = 16; /* may need iv for v1.5 */ derivedLen = 16; /* may need iv for v1.5 */
break; break;
#endif
#ifndef NO_SHA
case PBE_SHA1_DES: case PBE_SHA1_DES:
typeH = WC_SHA; typeH = WC_SHA;
derivedLen = 16; /* may need iv for v1.5 */ derivedLen = 16; /* may need iv for v1.5 */
@@ -2491,17 +2506,20 @@ static int CryptKey(const char* password, int passwordSz, byte* salt,
typeH = WC_SHA; typeH = WC_SHA;
derivedLen = 32; /* may need iv for v1.5 */ derivedLen = 32; /* may need iv for v1.5 */
break; break;
#endif /* !NO_SHA */
#endif /* !NO_DES3 */
#if !defined(NO_SHA) && !defined(NO_RC4)
case PBE_SHA1_RC4_128: case PBE_SHA1_RC4_128:
typeH = WC_SHA; typeH = WC_SHA;
derivedLen = 16; derivedLen = 16;
break; break;
#endif
#ifdef WOLFSSL_AES_256
case PBE_AES256_CBC: case PBE_AES256_CBC:
typeH = WC_SHA256; typeH = WC_SHA256;
derivedLen = 32; derivedLen = 32;
break; break;
#endif
default: default:
WOLFSSL_MSG("Unknown/Unsupported encrypt/decrypt id"); WOLFSSL_MSG("Unknown/Unsupported encrypt/decrypt id");
return ALGO_ID_E; return ALGO_ID_E;
@@ -2563,6 +2581,7 @@ static int CryptKey(const char* password, int passwordSz, byte* salt,
switch (id) { switch (id) {
#ifndef NO_DES3 #ifndef NO_DES3
#if !defined(NO_SHA) || !defined(NO_MD5)
case PBE_MD5_DES: case PBE_MD5_DES:
case PBE_SHA1_DES: case PBE_SHA1_DES:
{ {
@@ -2593,7 +2612,9 @@ static int CryptKey(const char* password, int passwordSz, byte* salt,
} }
break; break;
} }
#endif /* !NO_SHA || !NO_MD5 */
#ifndef NO_SHA
case PBE_SHA1_DES3: case PBE_SHA1_DES3:
{ {
Des3 des; Des3 des;
@@ -2635,8 +2656,9 @@ static int CryptKey(const char* password, int passwordSz, byte* salt,
} }
break; break;
} }
#endif /* !NO_SHA */
#endif #endif
#ifndef NO_RC4 #if !defined(NO_RC4) && !defined(NO_SHA)
case PBE_SHA1_RC4_128: case PBE_SHA1_RC4_128:
{ {
Arc4 dec; Arc4 dec;
@@ -2647,6 +2669,7 @@ static int CryptKey(const char* password, int passwordSz, byte* salt,
} }
#endif #endif
#ifndef NO_AES #ifndef NO_AES
#ifdef WOLFSSL_AES_256
case PBE_AES256_CBC: case PBE_AES256_CBC:
{ {
Aes dec; Aes dec;
@@ -2665,6 +2688,7 @@ static int CryptKey(const char* password, int passwordSz, byte* salt,
ForceZero(&dec, sizeof(Aes)); ForceZero(&dec, sizeof(Aes));
break; break;
} }
#endif /* WOLFSSL_AES_256 */
#endif #endif
default: default:
@@ -3179,6 +3203,7 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
if (out == NULL) { if (out == NULL) {
sz = inputSz; sz = inputSz;
switch (id) { switch (id) {
#if !defined(NO_DES3) && (!defined(NO_MD5) || !defined(NO_SHA))
case PBE_MD5_DES: case PBE_MD5_DES:
case PBE_SHA1_DES: case PBE_SHA1_DES:
case PBE_SHA1_DES3: case PBE_SHA1_DES3:
@@ -3187,10 +3212,11 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
sz &= 0xfffffff8; sz &= 0xfffffff8;
sz += 8; sz += 8;
break; break;
#endif /* !NO_DES3 && (!NO_MD5 || !NO_SHA) */
#if !defined(NO_RC4) && !defined(NO_SHA)
case PBE_SHA1_RC4_128: case PBE_SHA1_RC4_128:
break; break;
#endif
case -1: case -1:
break; break;
@@ -5025,6 +5051,7 @@ static int SetCurve(ecc_key* key, byte* output)
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#ifdef HAVE_ECC
static INLINE int IsSigAlgoECDSA(int algoOID) static INLINE int IsSigAlgoECDSA(int algoOID)
{ {
/* ECDSA sigAlgo must not have ASN1 NULL parameters */ /* ECDSA sigAlgo must not have ASN1 NULL parameters */
@@ -5035,6 +5062,7 @@ static INLINE int IsSigAlgoECDSA(int algoOID)
return 0; return 0;
} }
#endif
WOLFSSL_LOCAL word32 SetAlgoID(int algoOID, byte* output, int type, int curveSz) WOLFSSL_LOCAL word32 SetAlgoID(int algoOID, byte* output, int type, int curveSz)
{ {
@@ -5044,8 +5072,14 @@ WOLFSSL_LOCAL word32 SetAlgoID(int algoOID, byte* output, int type, int curveSz)
byte seqArray[MAX_SEQ_SZ + 1]; /* add object_id to end */ byte seqArray[MAX_SEQ_SZ + 1]; /* add object_id to end */
tagSz = (type == oidHashType || tagSz = (type == oidHashType ||
(type == oidSigType && !IsSigAlgoECDSA(algoOID) && (type == oidSigType
algoOID != ED25519k) || #ifdef HAVE_ECC
&& !IsSigAlgoECDSA(algoOID)
#endif
#ifdef HAVE_ED25519
&& algoOID != ED25519k
#endif
) ||
(type == oidKeyType && algoOID == RSAk)) ? 2 : 0; (type == oidKeyType && algoOID == RSAk)) ? 2 : 0;
algoName = OidFromId(algoOID, type, &algoSz); algoName = OidFromId(algoOID, type, &algoSz);
@@ -7800,7 +7834,13 @@ int wc_InitCert(Cert* cert)
XMEMSET(cert, 0, sizeof(Cert)); XMEMSET(cert, 0, sizeof(Cert));
cert->version = 2; /* version 3 is hex 2 */ cert->version = 2; /* version 3 is hex 2 */
#ifndef NO_SHA
cert->sigType = CTC_SHAwRSA; cert->sigType = CTC_SHAwRSA;
#elif !defined(NO_SHA256)
cert->sigType = CTC_SHA256wRSA;
#else
cert->sigType = 0;
#endif
cert->daysValid = 500; cert->daysValid = 500;
cert->selfSigned = 1; cert->selfSigned = 1;
cert->keyType = RSA_KEY; cert->keyType = RSA_KEY;

5
wolfcrypt/src/pkcs7.c
View File

@@ -3414,9 +3414,12 @@ int wc_PKCS7_EncodeEnvelopedData(PKCS7* pkcs7, byte* output, word32 outputSz)
outerContentTypeSz = wc_SetContentType(ENVELOPED_DATA, outerContentType); outerContentTypeSz = wc_SetContentType(ENVELOPED_DATA, outerContentType);
/* version, defined as 0 in RFC 2315 */ /* version, defined as 0 in RFC 2315 */
#ifdef HAVE_ECC
if (pkcs7->publicKeyOID == ECDSAk) { if (pkcs7->publicKeyOID == ECDSAk) {
verSz = SetMyVersion(2, ver, 0); verSz = SetMyVersion(2, ver, 0);
} else { } else
#endif
{
verSz = SetMyVersion(0, ver, 0); verSz = SetMyVersion(0, ver, 0);
} }

36
wolfssl/wolfcrypt/asn.h
View File

@@ -715,12 +715,18 @@ struct DecodedCert {
extern const char* const BEGIN_CERT; extern const char* const BEGIN_CERT;
extern const char* const END_CERT; extern const char* const END_CERT;
extern const char* const BEGIN_CERT_REQ; #ifdef WOLFSSL_CERT_REQ
extern const char* const END_CERT_REQ; extern const char* const BEGIN_CERT_REQ;
extern const char* const BEGIN_DSA_PARAM; extern const char* const END_CERT_REQ;
extern const char* const END_DSA_PARAM; #endif
extern const char* const BEGIN_DH_PARAM; #ifndef NO_DSA
extern const char* const END_DH_PARAM; extern const char* const BEGIN_DSA_PARAM;
extern const char* const END_DSA_PARAM;
#endif
#ifndef NO_DH
extern const char* const BEGIN_DH_PARAM;
extern const char* const END_DH_PARAM;
#endif
extern const char* const BEGIN_X509_CRL; extern const char* const BEGIN_X509_CRL;
extern const char* const END_X509_CRL; extern const char* const END_X509_CRL;
extern const char* const BEGIN_RSA_PRIV; extern const char* const BEGIN_RSA_PRIV;
@@ -729,14 +735,20 @@ extern const char* const BEGIN_PRIV_KEY;
extern const char* const END_PRIV_KEY; extern const char* const END_PRIV_KEY;
extern const char* const BEGIN_ENC_PRIV_KEY; extern const char* const BEGIN_ENC_PRIV_KEY;
extern const char* const END_ENC_PRIV_KEY; extern const char* const END_ENC_PRIV_KEY;
extern const char* const BEGIN_EC_PRIV; #ifdef HAVE_ECC
extern const char* const END_EC_PRIV; extern const char* const BEGIN_EC_PRIV;
extern const char* const BEGIN_DSA_PRIV; extern const char* const END_EC_PRIV;
extern const char* const END_DSA_PRIV; #endif
#if defined(HAVE_ECC) || defined(HAVE_ED25519) || !defined(NO_DSA)
extern const char* const BEGIN_DSA_PRIV;
extern const char* const END_DSA_PRIV;
#endif
extern const char* const BEGIN_PUB_KEY; extern const char* const BEGIN_PUB_KEY;
extern const char* const END_PUB_KEY; extern const char* const END_PUB_KEY;
extern const char* const BEGIN_EDDSA_PRIV; #ifdef HAVE_ED25519
extern const char* const END_EDDSA_PRIV; extern const char* const BEGIN_EDDSA_PRIV;
extern const char* const END_EDDSA_PRIV;
#endif
#ifdef NO_SHA #ifdef NO_SHA
#define SIGNER_DIGEST_SIZE WC_SHA256_DIGEST_SIZE #define SIGNER_DIGEST_SIZE WC_SHA256_DIGEST_SIZE