Changeset 63853 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Runtime: fixes for OpenSSL 1.1

Location:

trunk/src/VBox/Runtime

Files:

• VBox/VBoxRTDeps.cpp (modified) (3 diffs)
• common/crypto/pkix-verify.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/VBox/VBoxRTDeps.cpp

@@ -77 +77 @@
     (PFNRT)i2d_X509,
     (PFNRT)i2d_PublicKey,
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
     (PFNRT)RSA_generate_key,
 #endif
     (PFNRT)RSA_generate_key_ex,
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
     (PFNRT)DH_generate_parameters,
 #endif
     (PFNRT)DH_generate_parameters_ex,
     (PFNRT)RAND_load_file,
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
     (PFNRT)CRYPTO_set_dynlock_create_callback,
     (PFNRT)CRYPTO_set_dynlock_lock_callback,
@@ -97 +97 @@
     (PFNRT)RTBldCfgRevision,
     (PFNRT)SSL_free,
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
     (PFNRT)SSL_library_init,
     (PFNRT)SSL_load_error_strings,
@@ -104 +104 @@
     (PFNRT)SSL_CTX_use_certificate_file,
     (PFNRT)SSLv23_method,
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
     (PFNRT)TLSv1_server_method,
 #endif

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) */
 
     /*