summaryrefslogtreecommitdiff
path: root/www/httest/files/patch-src_ssl__module.c
blob: d48f481b427e4743888d547fc48937a47c942217 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
--- src/ssl_module.c.orig	2015-03-16 15:46:05 UTC
+++ src/ssl_module.c
@@ -349,7 +349,7 @@ static void ssl_message_trace(int write_
     case DTLS1_VERSION:
       str_version = "DTLS 1.0";
       break;
-#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL)
+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && defined(DTLS1_BAD_VER)
     case DTLS1_BAD_VER:
       str_version = "DTLS 1.0 (bad)";
       break;
@@ -421,7 +421,7 @@ static void ssl_message_trace(int write_
       version == TLS1_1_VERSION ||
 #endif
       version == DTLS1_VERSION
-#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL)
+#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();
   }
 #endif
+#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();
   }
 #endif
+#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();