com php-src: Update openssl.c: ext/openssl/openssl.c
| From: | Stanislav Malyshev | Date: | Sun, 29 Mar 2015 23:30:09 +0000 |
| Subject: | com php-src: Update openssl.c: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86380@lists.php.net to get a copy of this message | ||
Commit: 321bafccde1da30b89c4381ab9c7070ea5253868
Author: Eric F <iEFdev@users.noreply.github.com> Sat, 28 Mar 2015 04:20:42 +0100
Committer: iEFdev <eric@iefdev.se> Mon, 30 Mar 2015 01:30:09 +0200
Parents: a7e6687df63ac7149f7b77b9c1e3ac66cc19220a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=321bafccde1da30b89c4381ab9c7070ea5253868
Log:
Update openssl.c
Adding additional checks for sslv3.
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 0c20fa1..1697d80 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1250,7 +1250,9 @@ PHP_MINIT_FUNCTION(openssl)
}
php_stream_xport_register("ssl", php_openssl_ssl_socket_factory);
+#ifndef OPENSSL_NO_SSL3
php_stream_xport_register("sslv3", php_openssl_ssl_socket_factory);
+#endif
#ifndef OPENSSL_NO_SSL2
php_stream_xport_register("sslv2", php_openssl_ssl_socket_factory);
#endif
@@ -1299,7 +1301,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
#ifndef OPENSSL_NO_SSL2
php_stream_xport_unregister("sslv2");
#endif
+#ifndef OPENSSL_NO_SSL3
php_stream_xport_unregister("sslv3");
+#endif
php_stream_xport_unregister("tls");
php_stream_xport_unregister("tlsv1.0");
#if OPENSSL_VERSION_NUMBER >= 0x10001001L