From efca350cbaf725d94375426892e1086a31e4b778 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Fri, 1 Nov 2019 09:21:21 -0600 Subject: [PATCH 1/2] fix for macro typo's --- wolfcrypt/src/pkcs7.c | 2 +- wolfssl/wolfcrypt/asn.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index e978dcf72..3022544dc 100644 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -10803,7 +10803,7 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in, word32 inSz, byte* output, word32 outputSz) { -#if defined(HAVE_AESGCM) || defined(HAVE_AESCC) +#if defined(HAVE_AESGCM) || defined(HAVE_AESCCM) int recipFound = 0; int ret = 0, length; word32 idx = 0; diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index 7287a6f72..d6954e21c 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -818,7 +818,7 @@ struct DecodedCert { const byte* issuerRaw; /* pointer to issuer inside source */ int issuerRawLen; #endif -#ifndef IGNORE_NAME_CONSTRAINT +#ifndef IGNORE_NAME_CONSTRAINTS const byte* subjectRaw; /* pointer to subject inside source */ int subjectRawLen; #endif From 6ba3aa88ca189349533e6d9d9a1d36a3554225d3 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Fri, 1 Nov 2019 14:47:50 -0600 Subject: [PATCH 2/2] fix for build after CI tests --- wolfssl/wolfcrypt/asn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index d6954e21c..3c501398f 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -818,7 +818,7 @@ struct DecodedCert { const byte* issuerRaw; /* pointer to issuer inside source */ int issuerRawLen; #endif -#ifndef IGNORE_NAME_CONSTRAINTS +#if !defined(IGNORE_NAME_CONSTRAINTS) || defined(WOLFSSL_CERT_EXT) const byte* subjectRaw; /* pointer to subject inside source */ int subjectRawLen; #endif