Fix Bug #29296: add explicit sslv2 and sslv3 transports

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 002fd477481c3e8610c82c0be3327c8e6f7ed523..bd496b05350a5c6374200867c99b61767dba3d18 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -632,6 +632,8 @@ PHP_MINIT_FUNCTION(openssl)
        }
 
        php_stream_xport_register("ssl", php_openssl_ssl_socket_factory TSRMLS_CC);
+       php_stream_xport_register("sslv3", php_openssl_ssl_socket_factory TSRMLS_CC);
+       php_stream_xport_register("sslv2", php_openssl_ssl_socket_factory TSRMLS_CC);
        php_stream_xport_register("tls", php_openssl_ssl_socket_factory TSRMLS_CC);
 
        /* override the default tcp socket provider */

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 4171312907dbedee644663827d4af61ed09c82e5..9bb0fad3fe179cfbef984aadcd9ea1c8eed94040 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -691,6 +691,12 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen,
        if (strncmp(proto, "ssl", protolen) == 0) {
                sslsock->enable_on_connect = 1;
                sslsock->method = STREAM_CRYPTO_METHOD_SSLv23_CLIENT;
+       } else if (strncmp(proto, "sslv2", protolen) == 0) {
+               sslsock->enable_on_connect = 1;
+               sslsock->method = STREAM_CRYPTO_METHOD_SSLv2_CLIENT;
+       } else if (strncmp(proto, "sslv3", protolen) == 0) {
+               sslsock->enable_on_connect = 1;
+               sslsock->method = STREAM_CRYPTO_METHOD_SSLv3_CLIENT;
        } else if (strncmp(proto, "tls", protolen) == 0) {
                sslsock->enable_on_connect = 1;
                sslsock->method = STREAM_CRYPTO_METHOD_TLS_CLIENT;