Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
21274628 python/cryptography doesn't build on s12-76 s11-update
authorjenny.yung@oracle.com <jenny.yung@oracle.com>
Thu, 02 Jul 2015 15:29:20 -0700
branchs11-update
changeset 4589 13498d090b19
parent 4583 66352b5ed68a
child 4591 7c97ce741500
21274628 python/cryptography doesn't build on s12-76
components/openssl/openssl-1.0.1-fips-140/patches/42_rm_sslv2.patch file | annotate | diff | comparison | revisions
components/openssl/openssl-1.0.1/patches/42_rm_sslv2.patch file | annotate | diff | comparison | revisions 
--- a/components/openssl/openssl-1.0.1-fips-140/patches/42_rm_sslv2.patch	Wed Jul 01 13:37:02 2015 -0700
+++ b/components/openssl/openssl-1.0.1-fips-140/patches/42_rm_sslv2.patch	Thu Jul 02 15:29:20 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
-@@ -2016,12 +2016,24 @@
+@@ -2016,12 +2016,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 */
--- a/components/openssl/openssl-1.0.1/patches/42_rm_sslv2.patch	Wed Jul 01 13:37:02 2015 -0700
+++ b/components/openssl/openssl-1.0.1/patches/42_rm_sslv2.patch	Thu Jul 02 15:29:20 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
-@@ -2016,12 +2016,24 @@
+@@ -2016,12 +2016,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 */
upstream/oracle/userland-gate