Remove WOLFSSL_CERT_REJECT_TRAILING. Reject certs with trailing data by default, allow opt-out via WOLFSSL_NO_ASN_STRICT.

Author: kareem-wolfssl

.wolfssl_known_macro_extras

@@ -747,7 +747,6 @@ WOLFSSL_CAAM_BLACK_KEY_AESCCM
 WOLFSSL_CAAM_BLACK_KEY_SM
 WOLFSSL_CAAM_NO_BLACK_KEY
 WOLFSSL_CALLBACKS
-WOLFSSL_CERT_REJECT_TRAILING
 WOLFSSL_CHECK_DESKEY
 WOLFSSL_CHECK_MEM_ZERO
 WOLFSSL_CHIBIOS

src/internal.c

@@ -14307,19 +14307,17 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
     /* if der contains original source buffer then store for potential
      * retrieval */
     if (dCert->source != NULL && dCert->maxIdx > 0) {
-        word32 derCertSz = dCert->maxIdx;
-#ifdef WOLFSSL_CERT_REJECT_TRAILING
         /* Store only the certificate itself, bounded by the end of its outer
          * SEQUENCE (dCert->srcIdx), never any trailing bytes that may follow in
          * the source buffer. This keeps wolfSSL_i2d_X509 / wolfSSL_X509_get_der
          * / wolfSSL_X509_digest canonical - they operate on derCert - even on
          * builds/paths that do not reject trailing data (e.g.
          * WOLFSSL_NO_ASN_STRICT). It removes only bytes after the certificate,
          * so the signed certificate bytes are preserved verbatim. */
+        word32 derCertSz = dCert->maxIdx;
         if ((dCert->srcIdx > 0) && (dCert->srcIdx < derCertSz)) {
             derCertSz = dCert->srcIdx;
         }
-#endif
         if (AllocDer(&x509->derCert, derCertSz, CERT_TYPE, x509->heap) == 0) {
             XMEMCPY(x509->derCert->buffer, dCert->source, derCertSz);
         }
@@ -14657,14 +14655,12 @@ int CopyDecodedAcertToX509(WOLFSSL_X509_ACERT* x509, DecodedAcert* dAcert)
     /* if der contains original source buffer then store for potential
      * retrieval */
     if (dAcert->source != NULL && dAcert->maxIdx > 0) {
-        word32 derCertSz = dAcert->maxIdx;
-#ifdef WOLFSSL_CERT_REJECT_TRAILING
         /* Bound to the end of the attribute certificate's outer SEQUENCE so no
          * trailing bytes after it are ever re-emitted by i2d / get_der. */
+        word32 derCertSz = dAcert->maxIdx;
         if ((dAcert->srcIdx > 0) && (dAcert->srcIdx < derCertSz)) {
             derCertSz = dAcert->srcIdx;
         }
-#endif
         if (AllocDer(&x509->derCert, derCertSz, CERT_TYPE, x509->heap) == 0) {
             XMEMCPY(x509->derCert->buffer, dAcert->source, derCertSz);
         }

src/x509.c

@@ -6179,10 +6179,9 @@ static WOLFSSL_X509* loadX509orX509REQFromBuffer(
             InitDecodedCert(cert, der->buffer, der->length, NULL);
             /* For TRUSTED_CERT_TYPE the DER buffer holds the certificate
              * followed by auxiliary trust info. ParseCertRelative() recognizes
-             * the type: it parses only the certificate and treats it as
-             * CERT_TYPE for verification (and, under WOLFSSL_CERT_REJECT_TRAILING,
-             * permits the trailing aux data). The DER is trimmed to the
-             * certificate below. */
+             * the type: it parses only the certificate, permits the trailing
+             * aux data, and treats it as CERT_TYPE for verification. The DER is
+             * trimmed to the certificate below. */
             ret = ParseCertRelative(cert, type, 0, NULL, NULL);
             if (ret == 0) {
                 /* For TRUSTED_CERT_TYPE, truncate the DER buffer to exclude

wolfcrypt/src/asn.c

@@ -22229,7 +22229,7 @@ static int DecodeCertInternal(DecodedCert* cert, int verify, int* criticalExt,
         }
     }
 
-#ifdef WOLFSSL_CERT_REJECT_TRAILING
+#ifndef WOLFSSL_NO_ASN_STRICT
     /* Reject trailing data after the certificate's outer SEQUENCE.
      *
      * The template parser (GetASN_Items) only verifies that constructed items
@@ -22256,7 +22256,7 @@ static int DecodeCertInternal(DecodedCert* cert, int verify, int* criticalExt,
         WOLFSSL_ERROR_VERBOSE(ASN_PARSE_E);
         ret = ASN_PARSE_E;
     }
-#endif /* WOLFSSL_CERT_REJECT_TRAILING */
+#endif /* !WOLFSSL_NO_ASN_STRICT */
 
     if ((ret == 0) && (!done) && (badDate != 0)) {
         /* Parsed whole certificate fine but return any date errors. */
@@ -23479,16 +23479,13 @@ int ParseCertRelative(DecodedCert* cert, int type, int verify, void* cm,
     }
 
     /* TRUSTED CERTIFICATE blobs (RFC/OpenSSL "TRUSTED CERTIFICATE") carry
-     * auxiliary trust data after the certificate. Parse only the certificate
-     * prefix and treat it as a normal certificate for all verification /
-     * path-length logic below. Doing this here (rather than in a single caller)
-     * means any caller of wc_ParseCert()/ParseCertRelative() that passes
-     * TRUSTED_CERT_TYPE gets the correct, consistent behavior. */
+     * auxiliary trust data after the certificate. Permit that trailing data and
+     * parse only the certificate prefix; treat it as a normal certificate for
+     * all verification/path-length logic below. Doing this here (rather than in
+     * a single caller) means any caller of wc_ParseCert()/ParseCertRelative()
+     * that passes TRUSTED_CERT_TYPE gets the correct, consistent behavior. */
     if (type == TRUSTED_CERT_TYPE) {
-#ifdef WOLFSSL_CERT_REJECT_TRAILING
-        /* Opt out of the trailing-data rejection for the aux trust info. */
         cert->allowTrailing = 1;
-#endif
         type = CERT_TYPE;
     }
 

wolfssl/wolfcrypt/asn.h

@@ -2072,12 +2072,10 @@ struct DecodedCert {
 
     /* Option Bits */
     WC_BITFIELD subjectCNStored:1;      /* have we saved a copy we own */
-#ifdef WOLFSSL_CERT_REJECT_TRAILING
     WC_BITFIELD allowTrailing:1;        /* permit data after the cert's outer
                                          * SEQUENCE. Used internally for the
                                          * TRUSTED CERTIFICATE auxiliary trust
                                          * info. */
-#endif
     WC_BITFIELD extSubjKeyIdSet:1;      /* Set when the SKID was read from cert */
     WC_BITFIELD extAuthKeyIdSet:1;      /* Set when the AKID was read from cert */
 #ifndef IGNORE_NAME_CONSTRAINTS