1 # |
1 # |
2 # This was developed in house. Not applicable to the upstream. |
2 # This was developed in house. Not applicable to the upstream. |
3 # |
3 # |
4 --- openssl-1.0.1/ssl/s2_meth.c Fri May 8 09:38:33 2015 |
|
5 +++ openssl-1.0.1/ssl/s2_meth.c.new Fri May 8 09:51:53 2015 |
|
6 @@ -74,6 +74,13 @@ |
|
7 ssl2_accept, ssl2_connect, ssl2_get_method) |
|
8 #else /* !OPENSSL_NO_SSL2 */ |
|
9 |
|
10 +/* stub function */ |
|
11 +const SSL_METHOD * |
|
12 +SSLv2_method(void) |
|
13 +{ |
|
14 + return (NULL); |
|
15 +} |
|
16 + |
|
17 # if PEDANTIC |
|
18 static void *dummy = &dummy; |
|
19 # endif |
|
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 |
|
22 @@ -1087,6 +1087,13 @@ |
|
23 } |
|
24 #else /* !OPENSSL_NO_SSL2 */ |
|
25 |
|
26 +/* stub function */ |
|
27 +const SSL_METHOD * |
|
28 +SSLv2_client_method(void) |
|
29 +{ |
|
30 + return (NULL); |
|
31 +} |
|
32 + |
|
33 # if PEDANTIC |
|
34 static void *dummy = &dummy; |
|
35 # endif |
|
36 --- openssl-1.0.1/ssl/s2_srvr.c Fri May 8 09:38:02 2015 |
|
37 +++ openssl-1.0.1/ssl/s2_srvr.c.new Fri May 8 09:53:43 2015 |
|
38 @@ -1150,6 +1150,13 @@ |
|
39 } |
|
40 #else /* !OPENSSL_NO_SSL2 */ |
|
41 |
|
42 +/* stub function */ |
|
43 +const SSL_METHOD * |
|
44 +SSLv2_server_method(void) |
|
45 +{ |
|
46 + return (NULL); |
|
47 +} |
|
48 + |
|
49 # if PEDANTIC |
|
50 static void *dummy = &dummy; |
|
51 # endif |
|
52 --- openssl-1.0.1/ssl/ssl.h Tue May 26 11:13:15 2015 |
4 --- openssl-1.0.1/ssl/ssl.h Tue May 26 11:13:15 2015 |
53 +++ openssl-1.0.1/ssl/ssl.h.new Tue May 26 11:32:09 2015 |
5 +++ openssl-1.0.1/ssl/ssl.h.new Tue May 26 11:32:09 2015 |
54 @@ -2016,12 +2016,28 @@ |
6 @@ -2016,12 +2016,28 @@ |
55 /* This sets the 'default' SSL version that SSL_new() will create */ |
7 /* This sets the 'default' SSL version that SSL_new() will create */ |
56 int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth); |
8 int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth); |