From c3f4724c1d230b6ff86426702e9de9241518ebd6 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 10 Jan 2022 11:16:43 -0500 Subject: [PATCH] Replaced all instances of SSLv23_server_method() with TLS_server_method() (thanks to zcw159357 for suggesting this) --- citadel/modules/crypto/serv_crypto.c | 2 +- webcit-ng/tls.c | 2 +- webcit/crypto.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c index 6e81a7176..dcbab519e 100644 --- a/citadel/modules/crypto/serv_crypto.c +++ b/citadel/modules/crypto/serv_crypto.c @@ -215,7 +215,7 @@ void bind_to_key_and_certificate(void) { SSL_CTX *old_ctx, *new_ctx; - if (!(new_ctx = SSL_CTX_new(SSLv23_server_method()))) { + if (!(new_ctx = SSL_CTX_new(TLS_server_method()))) { syslog(LOG_ERR, "crypto: SSL_CTX_new failed: %s", ERR_reason_error_string(ERR_get_error())); return; } diff --git a/webcit-ng/tls.c b/webcit-ng/tls.c index 1f3011d5e..61ee44b0d 100644 --- a/webcit-ng/tls.c +++ b/webcit-ng/tls.c @@ -26,7 +26,7 @@ char *ssl_cipher_list = DEFAULT_SSL_CIPHER_LIST; void bind_to_key_and_certificate(void) { SSL_CTX *old_ctx, *new_ctx; - if (!(new_ctx = SSL_CTX_new(SSLv23_server_method()))) { + if (!(new_ctx = SSL_CTX_new(TLS_server_method()))) { syslog(LOG_WARNING, "SSL_CTX_new failed: %s", ERR_reason_error_string(ERR_get_error())); return; } diff --git a/webcit/crypto.c b/webcit/crypto.c index 330940a9c..3d9b53469 100644 --- a/webcit/crypto.c +++ b/webcit/crypto.c @@ -40,7 +40,7 @@ void bind_to_key_and_certificate(void) { snprintf(cert_file, sizeof key_file, "%s/keys/citadel.cer", ctdl_dir); } - if (!(new_ctx = SSL_CTX_new(SSLv23_server_method()))) { + if (!(new_ctx = SSL_CTX_new(TLS_server_method()))) { syslog(LOG_WARNING, "SSL_CTX_new failed: %s", ERR_reason_error_string(ERR_get_error())); return; } -- 2.30.2