Change TLS_server_method() to SSLv23_server_method() because people are still using...

diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c
index a899be7c6cfc38f9d9f051c67b4eff23f7cc356b..f78c0cd856de5bbb1a15904151182be50abaa5b0 100644 (file)
--- 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 4a939a90084e35ea93dcea248fdd911f5bdb8460..f891c57cd582537bb50742200d0ab98ae69b06a0 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(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 9f85b2ad9d135228b44d512d226de49e78a91f85..0a91289571e62850dca1d520d02233af6416a3d5 100644 (file)
--- 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;
        }