Changeset 59665 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Feb 14, 2016 11:57:30 PM (9 years ago)

Author:

vboxsync

Message:

iprt/asn1: Fixed bug represnation of explicit tags that caused trouble doing encoding by piggypacking on the enumeration method. Added simple X.509 testcase.

Location:

trunk/src/VBox/Runtime/common

Files:

• asn1/asn1-basics.cpp (modified) (1 diff)
• asn1/asn1-cursor.cpp (modified) (1 diff)
• crypto/x509-file.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/asn1/asn1-basics.cpp

@@ -576 +576 @@
  */
 
-RTDECL(int) RTAsn1ContextTagN_Init(PRTASN1CONTEXTTAG pThis, uint32_t uTag)
+RTDECL(int) RTAsn1ContextTagN_Init(PRTASN1CONTEXTTAG pThis, uint32_t uTag, PCRTASN1COREVTABLE pVtable)
 {
     return RTAsn1Core_InitEx(&pThis->Asn1Core,
                              uTag,
                              ASN1_TAGCLASS_CONTEXT | ASN1_TAGFLAG_CONSTRUCTED,
-                             NULL,
+                             pVtable,
                              RTASN1CORE_F_PRESENT);
 }

trunk/src/VBox/Runtime/common/asn1/asn1-cursor.cpp

@@ -415 +415 @@
 
 RTDECL(int) RTAsn1CursorGetContextTagNCursor(PRTASN1CURSOR pCursor, uint32_t fFlags, uint32_t uExpectedTag,
-                                             PRTASN1CONTEXTTAG pCtxTag, PRTASN1CURSOR pCtxTagCursor, const char *pszErrorTag)
-{
-    return rtAsn1CursorGetXxxxCursor(pCursor, fFlags, uExpectedTag, ASN1_TAGCLASS_CONTEXT | ASN1_TAGFLAG_CONSTRUCTED,
-                                     &pCtxTag->Asn1Core, pCtxTagCursor, pszErrorTag, "ctx tag");
+                                             PCRTASN1COREVTABLE pVtable, PRTASN1CONTEXTTAG pCtxTag, PRTASN1CURSOR pCtxTagCursor,
+                                             const char *pszErrorTag)
+{
+    int rc = rtAsn1CursorGetXxxxCursor(pCursor, fFlags, uExpectedTag, ASN1_TAGCLASS_CONTEXT | ASN1_TAGFLAG_CONSTRUCTED,
+                                       &pCtxTag->Asn1Core, pCtxTagCursor, pszErrorTag, "ctx tag");
+    pCtxTag->Asn1Core.pOps = pVtable;
+    return rc;
 }
 

trunk/src/VBox/Runtime/common/crypto/x509-file.cpp

@@ -70 +70 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, &g_RTAsn1DefaultAllocator);
+                rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, pAllocator);
                 if (RT_SUCCESS(rc))
                 {
@@ -105 +105 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, &g_RTAsn1DefaultAllocator);
+                rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, pAllocator);
                 if (RT_SUCCESS(rc))
                 {