diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2016-12-28 15:56:44 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2016-12-28 15:56:44 +0000 |
| commit | d74f3bafcc47ddba1ce7c896f5bcc104bcb2f933 (patch) | |
| tree | 43c498ef8698cbda73b69cb2049ffdc0db7e9026 /www/httest/files/patch-src_ssl__module.c | |
| parent | irc/rubygem-cinch: update to 2.3.3 (diff) | |
- Update to 2.4.18
- Port is now make jobs safe
Notes
Notes:
svn path=/head/; revision=429787
Diffstat (limited to 'www/httest/files/patch-src_ssl__module.c')
| -rw-r--r-- | www/httest/files/patch-src_ssl__module.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/www/httest/files/patch-src_ssl__module.c b/www/httest/files/patch-src_ssl__module.c index d48f481b427e..eb74d82629d8 100644 --- a/www/httest/files/patch-src_ssl__module.c +++ b/www/httest/files/patch-src_ssl__module.c @@ -1,6 +1,6 @@ ---- src/ssl_module.c.orig 2015-03-16 15:46:05 UTC +--- src/ssl_module.c.orig 2016-12-28 15:28:18 UTC +++ src/ssl_module.c -@@ -349,7 +349,7 @@ static void ssl_message_trace(int write_ +@@ -350,7 +350,7 @@ static void ssl_message_trace(int write_ case DTLS1_VERSION: str_version = "DTLS 1.0"; break; @@ -9,7 +9,7 @@ case DTLS1_BAD_VER: str_version = "DTLS 1.0 (bad)"; break; -@@ -421,7 +421,7 @@ static void ssl_message_trace(int write_ +@@ -422,7 +422,7 @@ static void ssl_message_trace(int write_ version == TLS1_1_VERSION || #endif version == DTLS1_VERSION @@ -17,30 +17,22 @@ +#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && defined(DTLS1_BAD_VER) || version == DTLS1_BAD_VER #endif - ) { -@@ -740,10 +740,12 @@ static int worker_set_client_method(work - config->meth = SSLv2_client_method(); + ) { +@@ -743,7 +743,7 @@ static int worker_set_client_method(work } #endif + #endif +-#ifndef OPENSSL_NO_SSL3_METHOD +#ifndef OPENSSL_NO_SSL3 else if (strcasecmp(sslstr, "SSL3") == 0) { is_ssl = 1; config->meth = SSLv3_client_method(); - } -+#endif - else if (strcasecmp(sslstr, "TLS1") == 0) { - is_ssl = 1; - config->meth = TLSv1_client_method(); -@@ -787,10 +789,12 @@ static int worker_set_server_method(work - config->meth = SSLv2_server_method(); +@@ -794,7 +794,7 @@ static int worker_set_server_method(work } #endif + #endif +-#ifndef OPENSSL_NO_SSL3_METHOD +#ifndef OPENSSL_NO_SSL3 else if (strcasecmp(sslstr, "SSL3") == 0) { is_ssl = 1; config->meth = SSLv3_server_method(); - } -+#endif - else if (strcasecmp(sslstr, "TLS1") == 0) { - is_ssl = 1; - config->meth = TLSv1_server_method(); |