From 30f9f1332e7dcf9d30a40768dd9c2070bc674957 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 12 Jan 2022 13:51:09 -0500 Subject: [PATCH] Change TLS_server_method() to SSLv23_server_method() because people are still using older builds that don't have the new name. --- 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 a899be7c6..f78c0cd85 100644 --- a/citadel/modules/crypto/serv_crypto.c +++ b/citadel/modules/crypto/serv_crypto.c @@ -220,7 +220,7 @@ void bind_to_key_and_certificate(void) { const SSL_METHOD *method = SSLv23_server_method(); if (!method) { - syslog(LOG_ERR, "crypto: TLS_server_method() failed: %s", ERR_reason_error_string(ERR_get_error())); + syslog(LOG_ERR, "crypto: SSLv23_server_method() failed: %s", ERR_reason_error_string(ERR_get_error())); return; } diff --git a/webcit-ng/tls.c b/webcit-ng/tls.c index 4a939a900..f891c57cd 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(TLS_server_method()))) { + if (!(new_ctx = SSL_CTX_new(SSLv23_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 9f85b2ad9..0a9128957 100644 --- a/webcit/crypto.c +++ b/webcit/crypto.c @@ -36,7 +36,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(TLS_server_method()))) { + if (!(new_ctx = SSL_CTX_new(SSLv23_server_method()))) { syslog(LOG_WARNING, "SSL_CTX_new failed: %s", ERR_reason_error_string(ERR_get_error())); return; } -- 2.30.2