diff options
author | Daniel Lowrey <rdlowrey@php.net> | 2014-02-20 17:35:44 -0700 |
---|---|---|
committer | Daniel Lowrey <rdlowrey@php.net> | 2014-02-20 17:35:44 -0700 |
commit | dcf27a1f6f205a22ecff1e537de6b13b0f1187ad (patch) | |
tree | bc4142bb839ab1e12775348d371ca7d594085408 /ext/openssl/php_openssl.h | |
parent | 5d0d88d1f2202896d62c21d0043264487fb12785 (diff) | |
parent | 9f94e0b51c5e5371c26890b16d9f307f66260bb5 (diff) | |
download | php-git-dcf27a1f6f205a22ecff1e537de6b13b0f1187ad.tar.gz |
Merge branch 'improved-tls-defaults' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'improved-tls-defaults' of https://github.com/rdlowrey/php-src:
Improve OpenSSL compile flag compatibility, minor updates
Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
Improve server forward secrecy, refactor client SNI
Add 'honor_cipher_order' server context option
Add 'capture_session_meta' context option
Disable TLS compression by default in both clients and servers
Release ssl buffers
Add openssl_get_cert_locations() function
Explicitly set cert verify depth if not specified
Strengthen default cipher list
Diffstat (limited to 'ext/openssl/php_openssl.h')
-rw-r--r-- | ext/openssl/php_openssl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h index 01e976f1f4..cab787afed 100644 --- a/ext/openssl/php_openssl.h +++ b/ext/openssl/php_openssl.h @@ -85,6 +85,8 @@ PHP_FUNCTION(openssl_spki_new); PHP_FUNCTION(openssl_spki_verify); PHP_FUNCTION(openssl_spki_export); PHP_FUNCTION(openssl_spki_export_challenge); + +PHP_FUNCTION(openssl_get_cert_locations); #else #define phpext_openssl_ptr NULL |