Updates for OpenSSL 1.1.0

Author: vshabanov

HsOpenSSL.cabal

@@ -127,7 +127,6 @@ Library
  OpenSSL.BIO
  OpenSSL.ERR
  OpenSSL.Objects
- OpenSSL.SSL
  OpenSSL.SSL.Option
  OpenSSL.Stack
  OpenSSL.Utils

OpenSSL.hs

@@ -46,13 +46,15 @@ module OpenSSL
  where
 import Control.Concurrent.MVar
 import Control.Monad
-import OpenSSL.SSL
 import System.IO.Unsafe
 
 #if !MIN_VERSION_base(4,6,0)
 import Control.Exception (onException, mask_)
 #endif
 
+foreign import ccall "HsOpenSSL_init"
+ initSSL :: IO ()
+
 foreign import ccall "HsOpenSSL_setupMutex"
  setupMutex :: IO ()
 
@@ -81,9 +83,7 @@ withOpenSSL io
  -- We don't want our initialisation sequence to be interrupted
  -- halfway.
  = do modifyMVarMasked_ isInitialised $ \ done ->
- do unless done $ do loadErrorStrings
- addAllAlgorithms
- libraryInit
+ do unless done $ do initSSL
  setupMutex
  return True
  io

OpenSSL/SSL.hs

@@ -136,7 +136,11 @@ data SSLMethod_
 
 foreign import ccall unsafe "SSL_CTX_new" _ssl_ctx_new :: Ptr SSLMethod_ -> IO (Ptr SSLContext_)
 foreign import ccall unsafe "SSL_CTX_free" _ssl_ctx_free :: Ptr SSLContext_ -> IO ()
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+foreign import ccall unsafe "TLS_method" _ssl_method :: IO (Ptr SSLMethod_)
+#else
 foreign import ccall unsafe "SSLv23_method" _ssl_method :: IO (Ptr SSLMethod_)
+#endif
 
 -- | Create a new SSL context.
 context :: IO SSLContext

OpenSSL/Session.hsc

@@ -4,8 +4,15 @@
 #include "mutex.h"
 
 /* OpenSSL ********************************************************************/
-void HsOpenSSL_OpenSSL_add_all_algorithms() {
+void HsOpenSSL_init() {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ // OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
+ // unnecessary in OpenSSL 1.1.0
+#else
+ SSL_load_error_strings();
  OpenSSL_add_all_algorithms();
+ SSL_library_init();
+#endif
 }
 
 void HsOpenSSL_OPENSSL_free(void* ptr) {

cbits/HsOpenSSL.c

@@ -33,7 +33,7 @@
 #endif
 
 /* OpenSSL ********************************************************************/
-void HsOpenSSL_OpenSSL_add_all_algorithms();
+void HsOpenSSL_init();
 void HsOpenSSL_OPENSSL_free(void* ptr);
 
 /* BIO ************************************************************************/