21274628 python/cryptography doesn't build on s12-76
authorjenny.yung@oracle.com <jenny.yung@oracle.com>
Tue, 30 Jun 2015 13:45:00 -0700
changeset 4575 bd0427b0c2c0
parent 4574 7ddafe81d631
child 4576 063b7e011118
21274628 python/cryptography doesn't build on s12-76
components/openssl/common/patches/041_rm_sslv2_v3.patch
--- a/components/openssl/common/patches/041_rm_sslv2_v3.patch	Fri Jun 26 13:22:26 2015 +0200
+++ b/components/openssl/common/patches/041_rm_sslv2_v3.patch	Tue Jun 30 13:45:00 2015 -0700
@@ -51,7 +51,7 @@
  # endif
 --- openssl-1.0.1/ssl/ssl.h	Tue May 26 11:13:15 2015
 +++ openssl-1.0.1/ssl/ssl.h.new	Tue May 26 11:32:09 2015
-@@ -2017,12 +2017,24 @@
+@@ -2017,12 +2017,26 @@
  /* This sets the 'default' SSL version that SSL_new() will create */
  int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
  
@@ -74,9 +74,11 @@
 +# define DEPRECATED
 +#endif
 +
++# ifndef OPENSSL_NO_SSL2
 +DEPRECATED const SSL_METHOD *SSLv2_method(void); /* SSLv2 */
 +DEPRECATED const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */
 +DEPRECATED const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */
++# endif
 +
  # ifndef OPENSSL_NO_SSL3_METHOD
  const SSL_METHOD *SSLv3_method(void); /* SSLv3 */