wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes from review by dgarske

Browse Source
This commit is contained in:
Anthony Hu
2022-03-02 17:39:15 -05:00
parent 0053bd3af1
commit a54045113a
2 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
wolfcrypt/src/asn.c
View File

@@ -5119,14 +5119,16 @@ static int DumpOID(const byte* oidData, word32 oidSz, word32 oid,
#ifdef HAVE_OID_DECODING #ifdef HAVE_OID_DECODING
{ {
word16 decOid[16]; byte decOid[MAX_OID_SZ];
word32 decOidSz = sizeof(decOid); word16 *out = decOid;
word32 decOidSz = sizeof(decOid) / 2;
/* Decode the OID into dotted form. */ /* Decode the OID into dotted form. */
ret = DecodeObjectId(oidData, oidSz, decOid, &decOidSz); ret = DecodeObjectId(oidData, oidSz, (word16*)decOid, &decOidSz);
if (ret == 0) { if (ret == 0) {
printf(" Decoded (Sz %d): ", decOidSz); printf(" Decoded (Sz %d): ", decOidSz);
for (i=0; i<decOidSz; i++) { for (i=0; i<decOidSz; i += 2) {
printf("%d.", decOid[i]); printf("%d.", *out);
out ++;
} }
printf("\n"); printf("\n");
} }
@@ -16565,13 +16567,14 @@ exit:
* @return Other -ve value on error. * @return Other -ve value on error.
*/ */
static int DecodeExtensionType(const byte* input, int length, word32 oid, static int DecodeExtensionType(const byte* input, int length, word32 oid,
byte critical, DecodedCert* cert, int *unknown) byte critical, DecodedCert* cert,
int *isUnknownExt)
{ {
int ret = 0; int ret = 0;
word32 idx = 0; word32 idx = 0;
if (unknown != NULL) if (isUnknownExt != NULL)
*unknown = 0; *isUnknownExt = 0;
switch (oid) { switch (oid) {
/* Basic Constraints. */ /* Basic Constraints. */
@@ -16756,8 +16759,8 @@ static int DecodeExtensionType(const byte* input, int length, word32 oid,
return ASN_PARSE_E; return ASN_PARSE_E;
break; break;
default: default:
if (unknown != NULL) if (isUnknownExt != NULL)
*unknown = 1; *isUnknownExt = 1;
#ifndef WOLFSSL_NO_ASN_STRICT #ifndef WOLFSSL_NO_ASN_STRICT
/* While it is a failure to not support critical extensions, /* While it is a failure to not support critical extensions,
* still parse the certificate ignoring the unsupported * still parse the certificate ignoring the unsupported
@@ -16813,11 +16816,14 @@ enum {
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \ #if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING) && defined(HAVE_OID_DECODING)
WOLFSSL_ASN_API void SetUnknownExtCallback(DecodedCert* cert, int wc_SetUnknownExtCallback(DecodedCert* cert,
wc_UnknownExtCallback cb) { wc_UnknownExtCallback cb) {
if (cert != NULL) { if (cert == NULL) {
cert->unknownExtCallback = cb; return BAD_FUNC_ARG;
} }
cert->unknownExtCallback = cb;
return 0;
} }
#endif #endif
@@ -16954,7 +16960,7 @@ end:
/* Parse each extension. */ /* Parse each extension. */
while ((ret == 0) && (idx < (word32)sz)) { while ((ret == 0) && (idx < (word32)sz)) {
byte critical = 0; byte critical = 0;
int unknown = 0; int isUnknownExt = 0;
/* Clear dynamic data. */ /* Clear dynamic data. */
XMEMSET(dataASN, 0, sizeof(*dataASN) * certExtASN_Length); XMEMSET(dataASN, 0, sizeof(*dataASN) * certExtASN_Length);
@@ -16971,28 +16977,29 @@ end:
/* Decode the extension by type. */ /* Decode the extension by type. */
ret = DecodeExtensionType(input + idx, length, oid, critical, cert, ret = DecodeExtensionType(input + idx, length, oid, critical, cert,
&unknown); &isUnknownExt);
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \ #if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING) && defined(HAVE_OID_DECODING)
if (unknown && (cert->unknownExtCallback != NULL)) { if (isUnknownExt && (cert->unknownExtCallback != NULL)) {
word16 decOid[16]; byte decOid[MAX_OID_SZ];
word32 decOidSz = sizeof(decOid); word32 decOidSz = sizeof(decOid) / 2;
ret = DecodeObjectId( ret = DecodeObjectId(
dataASN[CERTEXTASN_IDX_OID].data.oid.data, dataASN[CERTEXTASN_IDX_OID].data.oid.data,
dataASN[CERTEXTASN_IDX_OID].data.oid.length, dataASN[CERTEXTASN_IDX_OID].data.oid.length,
decOid, &decOidSz); (word16*)decOid, &decOidSz);
if (ret != 0) { if (ret != 0) {
/* Should never get here as the extension was successfully /* Should never get here as the extension was successfully
* decoded earlier. */ * decoded earlier. Something might be corrupted. */
printf("DecodeObjectId failed: %d\n", ret); WOLFSSL_MSG("DecodeObjectId() failed. Corruption?");
WOLFSSL_ERROR(ret);
} }
ret = cert->unknownExtCallback(decOid, decOidSz, critical, ret = cert->unknownExtCallback(decOid, decOidSz * 2, critical,
dataASN[CERTEXTASN_IDX_VAL].data.buffer.data, dataASN[CERTEXTASN_IDX_VAL].data.buffer.data,
dataASN[CERTEXTASN_IDX_VAL].length); dataASN[CERTEXTASN_IDX_VAL].length);
} }
#endif #endif
(void)unknown; (void)isUnknownExt;
/* Move index on to next extension. */ /* Move index on to next extension. */
idx += length; idx += length;

4
wolfssl/wolfcrypt/asn.h
View File

@@ -1461,7 +1461,7 @@ typedef struct CertSignCtx CertSignCtx;
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \ #if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING) && defined(HAVE_OID_DECODING)
typedef int (*wc_UnknownExtCallback)(const word16* oid, word32 oidSz, int crit, typedef int (*wc_UnknownExtCallback)(const byte* oid, word32 oidSz, int crit,
const unsigned char* der, word32 derSz); const unsigned char* der, word32 derSz);
#endif #endif
@@ -1827,7 +1827,7 @@ WOLFSSL_ASN_API int ParseCert(DecodedCert* cert, int type, int verify,
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \ #if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING) && defined(HAVE_OID_DECODING)
WOLFSSL_ASN_API void SetUnknownExtCallback(DecodedCert* cert, WOLFSSL_ASN_API int wc_SetUnknownExtCallback(DecodedCert* cert,
wc_UnknownExtCallback cb); wc_UnknownExtCallback cb);
#endif #endif