Replaced all instances of SSLv23_server_method() with TLS_server_method()

(thanks to zcw159357 for suggesting this)

diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c
index 6e81a7176de75e1873f95482805e1cd053fc3e9f..dcbab519ec2f01a8cb90ab932fcd7ab3d7ac16f2 100644 (file)
--- 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 1f3011d5eb0e0e7d8e5e434514c6eb14baacecba..61ee44b0d1f9f3e8b7b43dccedf9ef0dcd7e288c 100644 (file)
--- 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 330940a9cf653f3cb396cc331876e9e6f3bc20a8..3d9b534692b3b667504b90c282361ac6a3922b1a 100644 (file)
--- 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;
        }