| author | April Chin <april.chin@oracle.com> |
| Wed, 07 Oct 2015 16:26:17 -0700 | |
| changeset 4926 | 2d166edb9241 |
| permissions | -rw-r--r-- |
|
4926
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
Fix based on changes from upstream Ruby 2.2.3 trunk: |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
https://github.com/ruby/ruby/commit/801e1fe46d83c856844ba18ae4751478c59af0d1#diff-86486e0194e938f8d5bc4f00dce7d99a |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
to fix issue 11376 Stop using SSLv3 methods: |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
https://bugs.ruby-lang.org/issues/11376 |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
|
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
However, we do not include changes to extconf.rb that check for |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
the SSLv3_* methods and set the HAVE_SSLV3*METHOD macros; |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
in openssl on Solaris these methods are defined |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
as stub functions. |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
|
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
--- ruby-1.9.3-p551-orig/ext/openssl/ossl_ssl.c 2013-05-13 19:35:39.000000000 -0700 |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
+++ ruby-1.9.3-p551/ext/openssl/ossl_ssl.c 2015-10-06 14:27:11.176975409 -0700 |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
@@ -113,9 +113,12 @@ struct {
|
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
OSSL_SSL_METHOD_ENTRY(SSLv2_server), |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
OSSL_SSL_METHOD_ENTRY(SSLv2_client), |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
#endif |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
+defined(HAVE_SSLV3_CLIENT_METHOD) |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
OSSL_SSL_METHOD_ENTRY(SSLv3), |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
OSSL_SSL_METHOD_ENTRY(SSLv3_server), |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
OSSL_SSL_METHOD_ENTRY(SSLv3_client), |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
+#endif |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
OSSL_SSL_METHOD_ENTRY(SSLv23), |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
OSSL_SSL_METHOD_ENTRY(SSLv23_server), |
|
2d166edb9241
21953884 rubies fail to build on nightly (85) userland bits
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
OSSL_SSL_METHOD_ENTRY(SSLv23_client), |