16 + |
16 + |
17 # if PEDANTIC |
17 # if PEDANTIC |
18 static void *dummy = &dummy; |
18 static void *dummy = &dummy; |
19 # endif |
19 # endif |
20 --- openssl-1.0.1/ssl/s2_clnt.c Fri May 8 09:37:51 2015 |
20 --- openssl-1.0.1/ssl/s2_clnt.c Fri May 8 09:37:51 2015 |
21 +++ openssl-1.0.1/ssl/ss2_clnt.c.new Fri May 8 09:53:12 2015 |
21 +++ openssl-1.0.1/ssl/s2_clnt.c.new Fri May 8 09:53:12 2015 |
22 @@ -1087,6 +1087,13 @@ |
22 @@ -1087,6 +1087,13 @@ |
23 } |
23 } |
24 #else /* !OPENSSL_NO_SSL2 */ |
24 #else /* !OPENSSL_NO_SSL2 */ |
25 |
25 |
26 +/* stub function */ |
26 +/* stub function */ |
81 +# endif |
81 +# endif |
82 + |
82 + |
83 # ifndef OPENSSL_NO_SSL3_METHOD |
83 # ifndef OPENSSL_NO_SSL3_METHOD |
84 const SSL_METHOD *SSLv3_method(void); /* SSLv3 */ |
84 const SSL_METHOD *SSLv3_method(void); /* SSLv3 */ |
85 const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */ |
85 const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */ |
|
86 --- openssl/ssl/s3_meth.c.orig Fri Sep 11 12:19:54 2015 |
|
87 +++ openssl/ssl/s3_meth.c Fri Sep 11 12:22:24 2015 |
|
88 @@ -71,4 +71,13 @@ |
|
89 |
|
90 IMPLEMENT_ssl3_meth_func(SSLv3_method, |
|
91 ssl3_accept, ssl3_connect, ssl3_get_method) |
|
92 +#else /* !OPENSSL_NO_SSL3_METHOD */ |
|
93 + |
|
94 +/* stub function */ |
|
95 +const SSL_METHOD * |
|
96 +SSLv3_method(void) |
|
97 +{ |
|
98 + return (NULL); |
|
99 +} |
|
100 + |
|
101 #endif |
|
102 --- openssl/ssl/s3_clnt.c.orig Fri Sep 11 12:21:09 2015 |
|
103 +++ openssl/ssl/s3_clnt.c Fri Sep 11 12:24:31 2015 |
|
104 @@ -184,6 +184,15 @@ |
|
105 IMPLEMENT_ssl3_meth_func(SSLv3_client_method, |
|
106 ssl_undefined_function, |
|
107 ssl3_connect, ssl3_get_client_method) |
|
108 +#else /* !OPENSSL_NO_SSL3_METHOD */ |
|
109 + |
|
110 +/* stub function */ |
|
111 +const SSL_METHOD * |
|
112 +SSLv3_client_method(void) |
|
113 +{ |
|
114 + return (NULL); |
|
115 +} |
|
116 + |
|
117 #endif |
|
118 int ssl3_connect(SSL *s) |
|
119 { |
|
120 --- openssl/ssl/s3_srvr.c.orig Fri Sep 11 12:21:18 2015 |
|
121 +++ openssl/ssl/s3_srvr.c Fri Sep 11 12:24:15 2015 |
|
122 @@ -184,6 +184,15 @@ |
|
123 IMPLEMENT_ssl3_meth_func(SSLv3_server_method, |
|
124 ssl3_accept, |
|
125 ssl_undefined_function, ssl3_get_server_method) |
|
126 +#else /* !OPENSSL_NO_SSL3_METHOD */ |
|
127 + |
|
128 +/* stub function */ |
|
129 +const SSL_METHOD * |
|
130 +SSLv3_server_method(void) |
|
131 +{ |
|
132 + return (NULL); |
|
133 +} |
|
134 + |
|
135 #endif |
|
136 #ifndef OPENSSL_NO_SRP |
|
137 static int ssl_check_srp_ext_ClientHello(SSL *s, int *al) |
86 --- openssl-1.0.1/doc/ssl/SSL_CIPHER_get_name.pod Tue May 26 11:13:15 2015 |
138 --- openssl-1.0.1/doc/ssl/SSL_CIPHER_get_name.pod Tue May 26 11:13:15 2015 |
87 +++ openssl-1.0.1/doc/ssl/SSL_CIPHER_get_name.pod.new Tue May 26 11:32:09 2015 |
139 +++ openssl-1.0.1/doc/ssl/SSL_CIPHER_get_name.pod.new Tue May 26 11:32:09 2015 |
88 @@ -25,7 +25,7 @@ |
140 @@ -25,7 +25,7 @@ |
89 |
141 |
90 SSL_CIPHER_get_version() returns string which indicates the SSL/TLS protocol |
142 SSL_CIPHER_get_version() returns string which indicates the SSL/TLS protocol |