Changeset 95604 in vbox for trunk/src/VBox/Runtime/common/crypto

Timestamp:

Jul 12, 2022 9:37:41 AM (3 years ago)

Author:

vboxsync

Message:

IPRT/RTCrPkcs7SimpleSignSignedData: Implemented pAdditionalAuthenticatedAttribs. bugref:8691

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• iprt-openssl.cpp (modified) (2 diffs)
• pkcs7-sign.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/crypto/iprt-openssl.cpp

@@ -37 +37 @@
 # include <iprt/asn1.h>
 # include <iprt/crypto/digest.h>
+# include <iprt/crypto/pkcs7.h>
 
 # include "internal/iprt-openssl.h"
@@ -139 +140 @@
 }
 
+DECLHIDDEN(int) rtCrOpenSslConvertPkcs7Attribute(void **ppvOsslAttrib, PCRTCRPKCS7ATTRIBUTE pAttrib, PRTERRINFO pErrInfo)
+{
+    const unsigned char *pabEncoded;
+    uint32_t             cbEncoded;
+    void                *pvFree;
+    int rc = RTAsn1EncodeQueryRawBits(RTCrPkcs7Attribute_GetAsn1Core(pAttrib),
+                                      (const uint8_t **)&pabEncoded, &cbEncoded, &pvFree, pErrInfo);
+    if (RT_SUCCESS(rc))
+    {
+        X509_ATTRIBUTE *pOsslAttrib = NULL;
+        X509_ATTRIBUTE *pOsslAttribRet = d2i_X509_ATTRIBUTE(&pOsslAttrib, &pabEncoded, cbEncoded);
+        RTMemTmpFree(pvFree);
+        if (pOsslAttribRet == pOsslAttrib)
+        {
+            *ppvOsslAttrib = pOsslAttrib;
+            return VINF_SUCCESS;
+        }
+        rc = RTErrInfoSet(pErrInfo, VERR_CR_X509_OSSL_D2I_FAILED, "d2i_X509_ATTRIBUTE");
+    }
+    *ppvOsslAttrib = NULL;
+    return rc;
+}
+
+
+DECLHIDDEN(void) rtCrOpenSslFreeConvertedPkcs7Attribute(void *pvOsslAttrib)
+{
+    X509_ATTRIBUTE_free((X509_ATTRIBUTE *)pvOsslAttrib);
+}
+
+
 #endif /* IPRT_WITH_OPENSSL */
 

trunk/src/VBox/Runtime/common/crypto/pkcs7-sign.cpp

@@ -146 +146 @@
                     if (pCms != NULL)
                     {
-RT_NOREF(pAdditionalAuthenticatedAttribs); /** @todo */
-                        if (CMS_add1_signer(pCms, pOsslSigner, pEvpPrivateKey, pEvpMd, fOsslSign) != NULL)
+                        CMS_SignerInfo *pSignerInfo = CMS_add1_signer(pCms, pOsslSigner, pEvpPrivateKey, pEvpMd, fOsslSign);
+                        if (pSignerInfo)
                         {
-                            rc = CMS_final(pCms, pOsslData, NULL /*dcont*/, fOsslSign);
-                            if (rc > 0)
+                            if (pAdditionalAuthenticatedAttribs)
+                                for (uint32_t i = 0; i < pAdditionalAuthenticatedAttribs->cItems && RT_SUCCESS(rc); i++)
+                                {
+                                    PCRTCRPKCS7ATTRIBUTE pAttrib = pAdditionalAuthenticatedAttribs->papItems[i];
+                                    X509_ATTRIBUTE *pOsslAttrib;
+                                    rc = rtCrOpenSslConvertPkcs7Attribute((void **)&pOsslAttrib, pAttrib, pErrInfo);
+                                    if (RT_SUCCESS(rc))
+                                    {
+                                        rc = CMS_signed_add1_attr(pSignerInfo, pOsslAttrib);
+                                        rtCrOpenSslFreeConvertedPkcs7Attribute((void **)pOsslAttrib);
+                                        if (rc <= 0)
+                                            rc = RTErrInfoSet(pErrInfo, VERR_NO_MEMORY, "CMS_signed_add1_attr");
+                                    }
+                                }
+                            if (RT_SUCCESS(rc))
                             {
-                                /*
-                                 * Get the output and copy it into the result buffer.
-                                 */
-                                BIO *pOsslResult = BIO_new(BIO_s_mem());
-                                if (pOsslResult)
+                                rc = CMS_final(pCms, pOsslData, NULL /*dcont*/, fOsslSign);
+                                if (rc > 0)
                                 {
-                                    rc = i2d_CMS_bio(pOsslResult, pCms);
-                                    if (rc > 0)
+                                    /*
+                                     * Get the output and copy it into the result buffer.
+                                     */
+                                    BIO *pOsslResult = BIO_new(BIO_s_mem());
+                                    if (pOsslResult)
                                     {
-                                        BUF_MEM *pBuf = NULL;
-                                        rc = (int)BIO_get_mem_ptr(pOsslResult, &pBuf);
+                                        rc = i2d_CMS_bio(pOsslResult, pCms);
                                         if (rc > 0)
                                         {
-                                            AssertPtr(pBuf);
-                                            size_t const cbResult = pBuf->length;
-                                            if (   cbResultBuf >= cbResult
-                                                && pvResult != NULL)
+                                            BUF_MEM *pBuf = NULL;
+                                            rc = (int)BIO_get_mem_ptr(pOsslResult, &pBuf);
+                                            if (rc > 0)
                                             {
-                                                memcpy(pvResult, pBuf->data, cbResult);
-                                                rc = VINF_SUCCESS;
+                                                AssertPtr(pBuf);
+                                                size_t const cbResult = pBuf->length;
+                                                if (   cbResultBuf >= cbResult
+                                                    && pvResult != NULL)
+                                                {
+                                                    memcpy(pvResult, pBuf->data, cbResult);
+                                                    rc = VINF_SUCCESS;
+                                                }
+                                                else
+                                                    rc = VERR_BUFFER_OVERFLOW;
+                                                *pcbResult = cbResult;
                                             }
                                             else
-                                                rc = VERR_BUFFER_OVERFLOW;
-                                            *pcbResult = cbResult;
+                                                rc = RTErrInfoSet(pErrInfo, VERR_GENERAL_FAILURE, "BIO_get_mem_ptr");
                                         }
                                         else
-                                            rc = RTErrInfoSet(pErrInfo, VERR_GENERAL_FAILURE, "BIO_get_mem_ptr");
+                                            rc = RTErrInfoSet(pErrInfo, VERR_GENERAL_FAILURE, "i2d_CMS_bio");
+                                        BIO_free(pOsslResult);
                                     }
                                     else
-                                        rc = RTErrInfoSet(pErrInfo, VERR_GENERAL_FAILURE, "i2d_CMS_bio");
-                                    BIO_free(pOsslResult);
+                                        rc = RTErrInfoSet(pErrInfo, VERR_NO_MEMORY, "BIO_new/BIO_s_mem");
                                 }
                                 else
-                                    rc = RTErrInfoSet(pErrInfo, VERR_NO_MEMORY, "BIO_new/BIO_s_mem");
+                                    rc = RTErrInfoSet(pErrInfo, VERR_GENERAL_FAILURE, "CMS_final");
                             }
-                            else
-                                rc = RTErrInfoSet(pErrInfo, VERR_GENERAL_FAILURE, "CMS_final");
                         }
                         else