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

Timestamp:

Sep 15, 2016 3:37:57 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110706

Message:

Runtime: fixes for OpenSSL 1.1

File:

• trunk/src/VBox/Runtime/common/crypto/pkix-verify.cpp (modified) (6 diffs)

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

@@ -124 +124 @@
                              "EVP_get_digestbyname failed on %s (%s)", pszAlogSn, pAlgorithm->szObjId);
 
-# if OPENSSL_VERSION_NUMBER >= 0x10100000
+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 
     EVP_MD_CTX *pEvpMdCtx = EVP_MD_CTX_create();
@@ -174 +174 @@
     EVP_MD_CTX_destroy(pEvpMdCtx);
 
-# else /* OPENSSL_VERSION_NUMBER < 0x1010000 */
+# else /* OPENSSL_VERSION_NUMBER < 0x1010000 || defined(LIBRESSL_VERSION_NUMBER) */
 
     /* Initialize the EVP message digest context. */
@@ -219 +219 @@
     EVP_MD_CTX_cleanup(&EvpMdCtx);
 
-# endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */
+# endif /* OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) */
 
     /*
@@ -311 +311 @@
                              "EVP_get_digestbyname failed on %s (%s)", pszAlogSn, pszAlgObjId);
 
-# if OPENSSL_VERSION_NUMBER >= 0x10100000
+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 
     /* Create an EVP public key. */
@@ -371 +371 @@
         rcOssl = RTErrInfoSetF(pErrInfo, VERR_NO_MEMORY, "EVP_PKEY_new(%d) failed", iAlgoNid);
 
-# else /* OPENSSL_VERSION_NUMBER < 0x1010000 */
+# else /* OPENSSL_VERSION_NUMBER < 0x1010000 || defined(LIBRESSL_VERSION_NUMBER) */
 
     /* Create an EVP public key. */
@@ -430 +430 @@
         rcOssl = RTErrInfoSetF(pErrInfo, VERR_NO_MEMORY, "EVP_PKEY_new(%d) failed", pEvpMdType->required_pkey_type[0]);
 
-# endif /* OPENSSL_VERSION_NUMBER < 0x1010000 */
+# endif /* OPENSSL_VERSION_NUMBER < 0x1010000 || defined(LIBRESSL_VERSION_NUMBER) */
 
     /*