Changeset 97465 in vbox

Timestamp:

Nov 8, 2022 9:46:10 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/crypto: Corrected and unified the error checking of d2i_TYPE calls and corrected a i2d_TYPE one. Kudos to fth0 for finding these. ticketref:21097

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• iprt-openssl.cpp (modified) (2 diffs)
• key-create-rsa-openssl.cpp (modified) (1 diff)
• key-openssl.cpp (modified) (2 diffs)
• pkcs7-verify.cpp (modified) (1 diff)
• store.cpp (modified) (2 diffs)

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

@@ -111 +111 @@
         X509 *pOsslCertRet = d2i_X509(&pOsslCert, &pabEncoded, cbEncoded);
         RTMemTmpFree(pvFree);
-        if (pOsslCertRet == pOsslCert)
+        if (pOsslCert != NULL && pOsslCertRet == pOsslCert)
         {
             *ppvOsslCert = pOsslCert;
@@ -181 +181 @@
         X509_ATTRIBUTE *pOsslAttribRet = d2i_X509_ATTRIBUTE(&pOsslAttrib, &pabEncoded, cbEncoded);
         RTMemTmpFree(pvFree);
-        if (pOsslAttribRet == pOsslAttrib)
+        if (pOsslAttrib != NULL && pOsslAttribRet == pOsslAttrib)
         {
             *ppvOsslAttrib = pOsslAttrib;

trunk/src/VBox/Runtime/common/crypto/key-create-rsa-openssl.cpp

@@ -84 +84 @@
                     unsigned char *pbRsaPrivateKey = NULL;
                     int cbRsaPrivateKey = i2d_RSAPrivateKey(pRsa, &pbRsaPrivateKey);
-                    if (cbRsaPrivateKey)
+                    if (cbRsaPrivateKey > 0)
                     {
                         rc = rtCrKeyCreateRsaPrivate(phKey, pbRsaPrivateKey, cbRsaPrivateKey, NULL, NULL);

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

@@ -111 +111 @@
     else
         *ppEvpKey = pRet = d2i_PrivateKey(idKeyType, &pEvpNewKey, &puchPublicKey, hKey->cbEncoded);
-    if (pRet)
+    if (pRet != NULL && pRet == pEvpNewKey)
         return VINF_SUCCESS;
 
@@ -204 +204 @@
             else
                 *ppEvpKey = pRet = d2i_PrivateKey(idKeyType, &pEvpNewKey, &puchPublicKey, hKey->cbEncoded);
-            if (pRet)
+            if (pRet != NULL && pRet == pEvpNewKey)
                 return VINF_SUCCESS;
 

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

@@ -79 +79 @@
     AssertRCReturn(rcOssl, rcOssl);
 
-    PKCS7 *pOsslPkcs7   = NULL;
+    PKCS7 *pOsslPkcs7    = NULL;
     PKCS7 *pOsslPkcs7Ret = d2i_PKCS7(&pOsslPkcs7, &pbRawContent, cbRawContent);
 
     RTMemTmpFree(pvFree);
 
-    if (pOsslPkcs7Ret != NULL)
+    if (pOsslPkcs7 != NULL && pOsslPkcs7Ret == pOsslPkcs7)
     {
         STACK_OF(X509) *pAddCerts = NULL;

trunk/src/VBox/Runtime/common/crypto/store.cpp

@@ -445 +445 @@
                     && pCertCtx->cbEncoded > 0)
                 {
-                    X509 *pOsslCert = NULL;
+                    X509                *pOsslCert  = NULL;
                     const unsigned char *pabEncoded = (const unsigned char *)pCertCtx->pabEncoded;
-                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert)
+                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert && pOsslCert != NULL)
                     {
                         if (!X509_STORE_add_cert(pOsslStore, pOsslCert))
@@ -501 +501 @@
                     && pCertCtx->cbEncoded > 0)
                 {
-                    X509 *pOsslCert = NULL;
+                    X509                *pOsslCert  = NULL;
                     const unsigned char *pabEncoded = (const unsigned char *)pCertCtx->pabEncoded;
-                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert)
+                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert && pOsslCert != NULL)
                     {
                         if (!sk_X509_push(pOsslStack, pOsslCert))