Changeset 77815 in vbox

Timestamp:

Mar 20, 2019 11:56:41 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/ASN.1: Allow zero terminators at the end of IA5STRING so we can load some 2018 microsoft root cert.

File:

• trunk/src/VBox/Runtime/common/asn1/asn1-ut-string.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/common/asn1/asn1-ut-string.cpp

@@ -1240 +1240 @@
             if (RT_SUCCESS(rc))
                 break;
-            return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_UTF8_STRING_ENCODING,
-                                 "%s: Bad UTF-8 encoding (%Rrc)", pszErrorTag, rc);
+            return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_UTF8_STRING_ENCODING, "%s: Bad UTF-8 encoding (%Rrc, %.*Rhxs)",
+                                 pszErrorTag, rc, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
 
         case ASN1_TAG_NUMERIC_STRING:
@@ -1250 +1250 @@
                     && ch != ' ')
                     return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_NUMERIC_STRING_ENCODING,
-                                         "%s: Bad numberic string: ch=%#x", pszErrorTag, ch);
+                                         "%s: Bad numeric string: ch=%#x (pos %u in %.*Rhxs)", pszErrorTag, ch,
+                                         pThis->Asn1Core.cb - cch + 1, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
             }
             break;
@@ -1273 +1274 @@
                    )
                     return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_PRINTABLE_STRING_ENCODING,
-                                         "%s: Bad printable string: ch=%#x", pszErrorTag, ch);
+                                         "%s: Bad printable string: ch=%#x (pos %u in %.*Rhxs)", pszErrorTag, ch,
+                                         pThis->Asn1Core.cb - cch + 1, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
             }
             break;
@@ -1282 +1284 @@
                 unsigned char ch = *pch++;
                 if (ch == 0 || ch >= 0x80)
-                    return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_IA5_STRING_ENCODING,
-                                         "%s: Bad IA5 string: ch=%#x", pszErrorTag, ch);
+                {
+                    /* Ignore C-style zero terminator as the "Microsoft ECC Product Root Certificate Authority 2018"
+                       for instance, has a policy qualifier string "http://www.microsoft.com/pkiops/Docs/Repository.htm\0" */
+                    /** @todo should '\0' really be excluded above? */
+                    if (ch != 0 || cch != 0)
+                        return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_IA5_STRING_ENCODING,
+                                             "%s: Bad IA5 string: ch=%#x (pos %u in %.*Rhxs)", pszErrorTag, ch,
+                                             pThis->Asn1Core.cb - cch + 1, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
+                    break;
+                }
             }
             break;
@@ -1313 +1323 @@
                 if (ch < 0x20 || ch >= 0x7f)
                     return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_VISIBLE_STRING_ENCODING,
-                                         "%s: Bad visible string: ch=%#x", pszErrorTag, ch);
+                                         "%s: Bad visible string: ch=%#x (pos %u in %.*Rhxs)", pszErrorTag, ch,
+                                         pThis->Asn1Core.cb - cch + 1, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
             }
             break;
@@ -1330 +1341 @@
                     if (!RTUniCpIsValid(uc))
                         return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_UNIVERSAL_STRING_ENCODING,
-                                             "%s: Bad universal string: uc=%#x", pszErrorTag, uc);
+                                             "%s: Bad universal string: uc=%#x (pos %u in %.*Rhxs)", pszErrorTag, uc,
+                                             pThis->Asn1Core.cb - cch + 1, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
                     cchUtf8 += RTUniCpCalcUtf8Len(uc);
 
@@ -1340 +1352 @@
             }
             return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_UNIVERSAL_STRING_ENCODING,
-                                 "%s: Bad universal string: size not a multiple of 4: cch=%#x", pszErrorTag, cch);
+                                 "%s: Bad universal string: size not a multiple of 4: cch=%#x (%.*Rhxs)",
+                                 pszErrorTag, cch, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
 
         case ASN1_TAG_BMP_STRING:
@@ -1352 +1365 @@
                     if (!RTUniCpIsValid(uc))
                         return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_BMP_STRING_ENCODING,
-                                             "%s: Bad BMP string: uc=%#x", pszErrorTag, uc);
+                                             "%s: Bad BMP string: uc=%#x (pos %u in %.*Rhxs)", pszErrorTag, uc,
+                                             pThis->Asn1Core.cb - cch + 1, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
                     cchUtf8 += RTUniCpCalcUtf8Len(uc);
 
@@ -1362 +1376 @@
             }
             return RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_BMP_STRING_ENCODING,
-                                 "%s: Bad BMP string: odd number of bytes cch=%#x", pszErrorTag, cch);
+                                 "%s: Bad BMP string: odd number of bytes cch=%#x (pos %u in %.*Rhxs)",
+                                 pszErrorTag, cch, pThis->Asn1Core.cb, pThis->Asn1Core.uData.pch);
 
         default: