diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-03-03 18:57:33 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-03-05 10:03:11 -0700 |
| commit | 27849c998a77a093449dec4b051dfc266d5123ec (patch) | |
| tree | 1c6374721ba1ce4025cf32209fdd57a812ea4e62 /ext/openssl/php_openssl.h | |
| parent | 36d3c83abdb299dbbae784b081245c067914f19c (diff) | |
| download | php-git-27849c998a77a093449dec4b051dfc266d5123ec.tar.gz | |
Refactor + reorganize openssl files
- All streams-related code now lives in xp_ssl.c. Previously
stream code was split across both openssl.c and xp_ssl.c
- Folded superfluous php_openssl_structs.h into xp_ssl.c
- Server-specific options now set on SSL_CTX instead of SSL
- Deprecate SNI_server_name ctx option
- Miscellaneous refactoring
Diffstat (limited to 'ext/openssl/php_openssl.h')
| -rw-r--r-- | ext/openssl/php_openssl.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h index a823d30bd8..968919eb64 100644 --- a/ext/openssl/php_openssl.h +++ b/ext/openssl/php_openssl.h @@ -30,8 +30,16 @@ extern zend_module_entry openssl_module_entry; #define OPENSSL_ZERO_PADDING 2 /* Used for client-initiated handshake renegotiation DoS protection*/ -#define DEFAULT_RENEG_LIMIT 2 -#define DEFAULT_RENEG_WINDOW 300 +#define OPENSSL_DEFAULT_RENEG_LIMIT 2 +#define OPENSSL_DEFAULT_RENEG_WINDOW 300 +#define OPENSSL_DEFAULT_STREAM_VERIFY_DEPTH 9 +#define OPENSSL_DEFAULT_STREAM_CIPHERS "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:" \ + "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:" \ + "DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:" \ + "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:" \ + "ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:" \ + "DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:" \ + "AES256-GCM-SHA384:AES128:AES256:HIGH:!SSLv2:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!RC4:!ADH" php_stream_transport_factory_func php_openssl_ssl_socket_factory; |