vbox的更動 59665 路徑 trunk/src/VBox/Runtime

時間撮記:

2016-2-14 下午11:57:30 (9 年 以前)

作者:

vboxsync

訊息:

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

位置:

trunk/src/VBox/Runtime

檔案:

• common/asn1/asn1-basics.cpp (修改) (1 筆差異)
• common/asn1/asn1-cursor.cpp (修改) (1 筆差異)
• common/crypto/x509-file.cpp (修改) (2 筆差異)
• testcase/Makefile.kmk (修改) (2 筆差異)
• testcase/tstRTCrX509-md4-cert.der (新增)
• testcase/tstRTCrX509-md4.pem (新增)
• testcase/tstRTCrX509-md5-cert.der (新增)
• testcase/tstRTCrX509-md5.pem (新增)
• testcase/tstRTCrX509-sha1-cert.der (新增)
• testcase/tstRTCrX509-sha1.pem (新增)
• testcase/tstRTCrX509-sha224-cert.der (新增)
• testcase/tstRTCrX509-sha224.pem (新增)
• testcase/tstRTCrX509-sha256-cert.der (新增)
• testcase/tstRTCrX509-sha256.pem (新增)
• testcase/tstRTCrX509-sha384-cert.der (新增)
• testcase/tstRTCrX509-sha384.pem (新增)
• testcase/tstRTCrX509-sha512-cert.der (新增)
• testcase/tstRTCrX509-sha512.pem (新增)

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))
                 {

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -53 +53 @@
         tstRTCritSect \
         tstRTCritSectRw \
+        tstRTCrX509-1 \
         tstRTCType \
         tstRTDigest \
@@ -257 +258 @@
 tstRTCritSectW32_DEFS = TRY_WIN32_CRIT
 
+tstRTCrX509-1_TEMPLATE      = VBOXR3TSTEXE
+tstRTCrX509-1_SOURCES       = tstRTCrX509-1.cpp
+tstRTCrX509-1_INCS          = $(tstRTCrX509-1_0_OUTDIR)
+tstRTCrX509-1_CLEAN         = $(tstRTCrX509-1_0_OUTDIR)/tstRTCrX509-1.h
+tstRTCrX509-1_INTERMEDIATES = $(tstRTCrX509-1_0_OUTDIR)/tstRTCrX509-1.h
+tstRTCrX509-1_VBOX_FILES := \
+        Pem_md4=$(PATH_SUB_CURRENT)/tstRTCrX509-md4.pem \
+        Pem_md5=$(PATH_SUB_CURRENT)/tstRTCrX509-md5.pem \
+        Pem_sha1=$(PATH_SUB_CURRENT)/tstRTCrX509-sha1.pem \
+        Pem_sha224=$(PATH_SUB_CURRENT)/tstRTCrX509-sha224.pem \
+        Pem_sha256=$(PATH_SUB_CURRENT)/tstRTCrX509-sha256.pem \
+        Pem_sha384=$(PATH_SUB_CURRENT)/tstRTCrX509-sha384.pem \
+        Pem_sha512=$(PATH_SUB_CURRENT)/tstRTCrX509-sha512.pem \
+       \
+        CertDer_md4=$(PATH_SUB_CURRENT)/tstRTCrX509-md4-cert.der \
+        CertDer_md5=$(PATH_SUB_CURRENT)/tstRTCrX509-md5-cert.der \
+        CertDer_sha1=$(PATH_SUB_CURRENT)/tstRTCrX509-sha1-cert.der \
+        CertDer_sha224=$(PATH_SUB_CURRENT)/tstRTCrX509-sha224-cert.der \
+        CertDer_sha256=$(PATH_SUB_CURRENT)/tstRTCrX509-sha256-cert.der \
+        CertDer_sha384=$(PATH_SUB_CURRENT)/tstRTCrX509-sha384-cert.der \
+        CertDer_sha512=$(PATH_SUB_CURRENT)/tstRTCrX509-sha512-cert.der \
+       $(NO_SUCH_VARIABLE)
+$$(tstRTCrX509-1_0_OUTDIR)/tstRTCrX509-1.h: \
+                $(foreach file,$(tstRTCrX509-1_VBOX_FILES),$(lastword  $(subst =,$(SP) ,$(file)))) \
+                $(VBOX_BIN2C) \
+                | $$(dir $$@)
+        $(RM) -f -- "$@"
+        $(foreach file,$(tstRTCrX509-1_VBOX_FILES) \
+        , $(NLTAB)$(VBOX_BIN2C) -ascii --append \
+                "$(firstword $(subst =,$(SP) ,$(file)))" \
+                "$(lastword  $(subst =,$(SP) ,$(file)))" \
+                "$@")
+
+
 tstRTCType_TEMPLATE = VBOXR3TSTEXE
 tstRTCType_SOURCES = tstRTCType.cpp