diff options
author | Steve Bennett <steveb@workware.net.au> | 2018-11-24 11:24:44 +1000 |
---|---|---|
committer | Steve Bennett <steveb@workware.net.au> | 2018-11-24 11:24:44 +1000 |
commit | 41b8d490f6dc80b10af4eaa3332749f4fb52d2d2 (patch) | |
tree | 3fb376eecb046343898144a864b896d7e08306ab | |
parent | a3c72e6f060bc51cd59b486e8d564489856f3de3 (diff) | |
download | jimtcl-41b8d490f6dc80b10af4eaa3332749f4fb52d2d2.zip jimtcl-41b8d490f6dc80b10af4eaa3332749f4fb52d2d2.tar.gz jimtcl-41b8d490f6dc80b10af4eaa3332749f4fb52d2d2.tar.bz2 |
aio: Prefer TLS_method() over TLSv1_2_method()
To avoid a deprecation warning
Signed-off-by: Steve Bennett <steveb@workware.net.au>
-rw-r--r-- | auto.def | 4 | ||||
-rw-r--r-- | jim-aio.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -284,6 +284,10 @@ if {[opt-bool-or-full ssl]} { user-error "SSL support requires OpenSSL" } } + # Later versions deprecate TLSv1_2_method, but older versions don't have TLS_method + if {![cc-check-function-in-lib TLS_method ssl]} { + define-append CCOPTS -DUSE_TLSv1_2_method + } } if {[opt-bool-or-full lineedit]} { if {([cc-check-includes termios.h] && [have-feature isatty]) || [have-feature winconsole]} { @@ -1636,13 +1636,17 @@ static void JimAioSslContextDelProc(struct Jim_Interp *interp, void *privData) ERR_free_strings(); } +#ifdef USE_TLSv1_2_method +#define TLS_method TLSv1_2_method +#endif + static SSL_CTX *JimAioSslCtx(Jim_Interp *interp) { SSL_CTX *ssl_ctx = (SSL_CTX *)Jim_GetAssocData(interp, "ssl_ctx"); if (ssl_ctx == NULL) { SSL_load_error_strings(); SSL_library_init(); - ssl_ctx = SSL_CTX_new(TLSv1_2_method()); + ssl_ctx = SSL_CTX_new(TLS_method()); if (ssl_ctx && SSL_CTX_set_default_verify_paths(ssl_ctx)) { SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_NONE, NULL); Jim_SetAssocData(interp, "ssl_ctx", JimAioSslContextDelProc, ssl_ctx); |