equal
deleted
inserted
replaced
49 # if PEDANTIC |
49 # if PEDANTIC |
50 static void *dummy = &dummy; |
50 static void *dummy = &dummy; |
51 # endif |
51 # endif |
52 --- openssl-1.0.1/ssl/ssl.h Tue May 26 11:13:15 2015 |
52 --- 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 |
53 +++ openssl-1.0.1/ssl/ssl.h.new Tue May 26 11:32:09 2015 |
54 @@ -2016,12 +2016,24 @@ |
54 @@ -2016,12 +2016,26 @@ |
55 /* This sets the 'default' SSL version that SSL_new() will create */ |
55 /* 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); |
56 int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth); |
57 |
57 |
58 -# ifndef OPENSSL_NO_SSL2 |
58 -# ifndef OPENSSL_NO_SSL2 |
59 -const SSL_METHOD *SSLv2_method(void); /* SSLv2 */ |
59 -const SSL_METHOD *SSLv2_method(void); /* SSLv2 */ |
72 +# define DEPRECATED __attribute__((deprecated)) |
72 +# define DEPRECATED __attribute__((deprecated)) |
73 +#else |
73 +#else |
74 +# define DEPRECATED |
74 +# define DEPRECATED |
75 +#endif |
75 +#endif |
76 + |
76 + |
|
77 +# ifndef OPENSSL_NO_SSL2 |
77 +DEPRECATED const SSL_METHOD *SSLv2_method(void); /* SSLv2 */ |
78 +DEPRECATED const SSL_METHOD *SSLv2_method(void); /* SSLv2 */ |
78 +DEPRECATED const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */ |
79 +DEPRECATED const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */ |
79 +DEPRECATED const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */ |
80 +DEPRECATED const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */ |
|
81 +# endif |
80 + |
82 + |
81 # ifndef OPENSSL_NO_SSL3_METHOD |
83 # ifndef OPENSSL_NO_SSL3_METHOD |
82 const SSL_METHOD *SSLv3_method(void); /* SSLv3 */ |
84 const SSL_METHOD *SSLv3_method(void); /* SSLv3 */ |
83 const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */ |
85 const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */ |
84 --- openssl-1.0.1/doc/ssl/SSL_CIPHER_get_name.pod Tue May 26 11:13:15 2015 |
86 --- openssl-1.0.1/doc/ssl/SSL_CIPHER_get_name.pod Tue May 26 11:13:15 2015 |