Changeset 73706 in vbox for trunk/src/VBox

Timestamp:

Aug 16, 2018 9:40:01 AM (6 years ago)

Author:

vboxsync

Message:

IPRT: Better fix for missing md4 failure; adding information status codes for indicating deprecated and compromised digests when used. [build fix,++]

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• pkix-sign.cpp (modified) (1 diff)
• pkix-verify.cpp (modified) (2 diffs)

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

@@ -241 +241 @@
      * Check the result.
      */
-    if (RT_SUCCESS(rcIprt) && RT_SUCCESS(rcOssl))
-        return VINF_SUCCESS;
-    if (RT_FAILURE_NP(rcIprt) && RT_FAILURE_NP(rcOssl))
+    if (   (RT_SUCCESS(rcIprt) && RT_SUCCESS(rcOssl))
+        || (RT_FAILURE_NP(rcIprt) && RT_FAILURE_NP(rcOssl))
+        || (RT_SUCCESS(rcIprt) && rcOssl == VERR_CR_PKIX_OSSL_CIPHER_ALGO_NOT_KNOWN_EVP) )
         return rcIprt;
     AssertMsgFailed(("rcIprt=%Rrc rcOssl=%Rrc\n", rcIprt, rcOssl));

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

@@ -152 +152 @@
      * Check the result.
      */
-    if (   RT_SUCCESS(rcIprt) && RT_SUCCESS(rcOssl)
+    if (   (RT_SUCCESS(rcIprt) && RT_SUCCESS(rcOssl))
         || (RT_FAILURE_NP(rcIprt) && RT_FAILURE_NP(rcOssl))
         || (RT_SUCCESS(rcIprt) && rcOssl == VERR_CR_PKIX_OSSL_CIPHER_ALGO_NOT_KNOWN_EVP) )
@@ -274 +274 @@
      * Check the result.
      */
-    if (   RT_SUCCESS(rcIprt) && RT_SUCCESS(rcOssl)
+    if (   (RT_SUCCESS(rcIprt) && RT_SUCCESS(rcOssl))
         || (RT_FAILURE_NP(rcIprt) && RT_FAILURE_NP(rcOssl))
         || (RT_SUCCESS(rcIprt) && rcOssl == VERR_CR_PKIX_OSSL_CIPHER_ALGO_NOT_KNOWN_EVP) )