[Ttssh2-commit] [6580] SSL_library_init関数はOpenSSL 1.1.0でdeprecatedとなり、OPENSSL_init_ssl関数に置き換わった。

svnno****@sourc***** svnno****@sourc*****
2017年 1月 17日 (火) 23:57:45 JST


Revision: 6580
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6580
Author:   yutakapon
Date:     2017-01-17 23:57:45 +0900 (Tue, 17 Jan 2017)
Log Message:
-----------
SSL_library_init関数はOpenSSL 1.1.0でdeprecatedとなり、OPENSSL_init_ssl関数に置き換わった。
SSL_load_error_strings関数はOpenSSL 1.1.0でdeprecatedとなり、呼び出し不要となった。

Modified Paths:
--------------
    branches/openssl_1_1_0/TTProxy/SSLLIB.h
    branches/openssl_1_1_0/TTProxy/SSLSocket.h

-------------- next part --------------
Modified: branches/openssl_1_1_0/TTProxy/SSLLIB.h
===================================================================
--- branches/openssl_1_1_0/TTProxy/SSLLIB.h	2017-01-16 15:13:23 UTC (rev 6579)
+++ branches/openssl_1_1_0/TTProxy/SSLLIB.h	2017-01-17 14:57:45 UTC (rev 6580)
@@ -61,7 +61,6 @@
 DECLARE_SSLEAY32_API_v(SSL_free, (SSL *ssl), (ssl))
 DECLARE_SSLEAY32_API(int, SSL_get_error, (const SSL *s,int ret_code), (s,ret_code))
 DECLARE_SSLEAY32_API(X509 *, SSL_get_peer_certificate, (const SSL *s), (s))
-DECLARE_SSLEAY32_API_v(SSL_load_error_strings, (void ), ())
 DECLARE_SSLEAY32_API(SSL *, SSL_new, (SSL_CTX *ctx), (ctx))
 DECLARE_SSLEAY32_API(int, SSL_read, (SSL *ssl,void *buf,int num), (ssl, buf, num))
 DECLARE_SSLEAY32_API(int, SSL_set_fd, (SSL *s, int fd), (s, fd))
@@ -74,6 +73,6 @@
 #endif
 DECLARE_SSLEAY32_API(int, SSL_CTX_load_verify_locations, (SSL_CTX *ctx, const char *CAfile, const char *CApath), (ctx, CAfile, CApath))
 DECLARE_SSLEAY32_API(long, SSL_get_verify_result, (const SSL *ssl), (ssl))
-DECLARE_SSLEAY32_API(int, SSL_library_init, (void), ())
+DECLARE_SSLEAY32_API(int, OPENSSL_init_ssl, (uint64_t opts, const OPENSSL_INIT_SETTINGS *settings), (opts, settings))
 
 #endif//_SSLLIB_h_
\ No newline at end of file

Modified: branches/openssl_1_1_0/TTProxy/SSLSocket.h
===================================================================
--- branches/openssl_1_1_0/TTProxy/SSLSocket.h	2017-01-16 15:13:23 UTC (rev 6579)
+++ branches/openssl_1_1_0/TTProxy/SSLSocket.h	2017-01-17 14:57:45 UTC (rev 6580)
@@ -54,8 +54,12 @@
 
     private:
         SSLContext():ctx(NULL) {
-            SSL_library_init(); 
-            SSL_load_error_strings();
+			// SSL_library_init\x8A֐\x94\x82\xCDOpenSSL 1.1.0\x82\xC5deprecated\x82ƂȂ\xE8\x81A
+			// OPENSSL_init_ssl\x8A֐\x94\x82ɒu\x82\xAB\x8A\xB7\x82\xED\x82\xC1\x82\xBD\x81B
+			OPENSSL_init_ssl(0, NULL);
+
+            // SSL_load_error_strings\x8A֐\x94\x82\xCDOpenSSL 1.1.0\x82\xC5deprecated\x82ƂȂ\xE8\x81A
+			// \x8CĂяo\x82\xB5\x95s\x97v\x82ƂȂ\xC1\x82Ă\xA2\x82\xE9\x81B
             ctx = SSL_CTX_new(SSLv23_client_method());
             SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
         }



Ttssh2-commit メーリングリストの案内