Changeset 64012 in vbox for trunk

Timestamp:

Sep 26, 2016 2:30:17 PM (8 years ago)

Author:

vboxsync

Message:

Main/webservice: OpenSSL 1.1 adaptions

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (6 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -50 +50 @@
 #include <iprt/stream.h>
 #include <iprt/asm.h>
+
+#ifdef WITH_OPENSSL
+# include <openssl/opensslv.h>
+#endif
 
 #ifndef RT_OS_WINDOWS
@@ -749 +753 @@
 }
 
-#ifdef WITH_OPENSSL
+#if defined(WITH_OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER))
 /****************************************************************************
  *
- * OpenSSL convenience functions for multithread support
+ * OpenSSL convenience functions for multithread support.
+ * Not required for OpenSSL 1.1+
  *
  ****************************************************************************/
@@ -854 +859 @@
     g_pSSLMutexes = NULL;
 }
-#endif /* WITH_OPENSSL */
+#endif /* WITH_OPENSSL && (OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)) */
 
 /****************************************************************************
@@ -864 +869 @@
 static void doQueuesLoop()
 {
-#ifdef WITH_OPENSSL
+#if defined(WITH_OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER))
     if (g_fSSL && CRYPTO_thread_setup())
     {
@@ -870 +875 @@
         exit(RTEXITCODE_FAILURE);
     }
-#endif /* WITH_OPENSSL */
+#endif 
 
     // set up gSOAP
@@ -965 +970 @@
     soap_done(&soap); // close master socket and detach environment
 
-#ifdef WITH_OPENSSL
+#if defined(WITH_OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER))
     if (g_fSSL)
         CRYPTO_thread_cleanup();
-#endif /* WITH_OPENSSL */
+#endif
 }