SSLV2 patch cleanup

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index bc644a709eb1563e63dc8bd5c29eb776e6d0c14a..39067ad95047cb4b48fa3e758b443e15a41bbccb 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1074,7 +1074,9 @@ 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);
+#ifndef OPENSSL_NO_SSL2
        php_stream_xport_register("sslv2", php_openssl_ssl_socket_factory TSRMLS_CC);
+#endif
        php_stream_xport_register("tls", php_openssl_ssl_socket_factory TSRMLS_CC);
 
        /* override the default tcp socket provider */
@@ -1109,7 +1111,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
        php_unregister_url_stream_wrapper("ftps" TSRMLS_CC);
 
        php_stream_xport_unregister("ssl" TSRMLS_CC);
+#ifndef OPENSSL_NO_SSL2
        php_stream_xport_unregister("sslv2" TSRMLS_CC);
+#endif
        php_stream_xport_unregister("sslv3" TSRMLS_CC);
        php_stream_xport_unregister("tls" TSRMLS_CC);
 

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index dca57e26718f5b586b70a3e4ac77ba1a79241ad9..58c36ab39273897e0c91cab1d4349cbc7b8710c0 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -330,8 +330,8 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
                        break;
                case STREAM_CRYPTO_METHOD_SSLv2_CLIENT:
 #ifdef OPENSSL_NO_SSL2
-            php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled in openSSL");
-            return -1;
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the openSSL library PHP is linked against");
+                       return -1;
 #else
                        sslsock->is_client = 1;
                        method = SSLv2_client_method();
@@ -355,8 +355,8 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
                        break;
                case STREAM_CRYPTO_METHOD_SSLv2_SERVER:
 #ifdef OPENSSL_NO_SSL2
-            php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled in openSSL");
-            return -1;
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the openSSL library PHP is linked against");
+                       return -1;
 #else
                        sslsock->is_client = 0;
                        method = SSLv2_server_method();
@@ -922,8 +922,13 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen,
                sslsock->enable_on_connect = 1;
                sslsock->method = STREAM_CRYPTO_METHOD_SSLv23_CLIENT;
        } else if (strncmp(proto, "sslv2", protolen) == 0) {
+#ifdef OPENSSL_NO_SSL2
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the openSSL library PHP is linked against");
+               return NULL;
+#else
                sslsock->enable_on_connect = 1;
                sslsock->method = STREAM_CRYPTO_METHOD_SSLv2_CLIENT;
+#endif
        } else if (strncmp(proto, "sslv3", protolen) == 0) {
                sslsock->enable_on_connect = 1;
                sslsock->method = STREAM_CRYPTO_METHOD_SSLv3_CLIENT;