diff options
| author | Remi Collet <remi@php.net> | 2014-03-14 09:52:47 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-03-14 09:52:47 +0100 |
| commit | 89dc5924c962858c4584f03fb638efd8b7090303 (patch) | |
| tree | ba5d5762c7b2743d37dbcddc326c9eb42870c519 | |
| parent | f120463efe073f61c4e8052eed36f3156e74f3f0 (diff) | |
| parent | 80fa2ff646f804951a72a580976d09ca28a98444 (diff) | |
| download | php-git-89dc5924c962858c4584f03fb638efd8b7090303.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #66833 Default digest algo is still MD5
Fix 5.5.10 NEWS
| -rwxr-xr-x | ext/openssl/openssl.c | 2 | ||||
| -rw-r--r-- | ext/openssl/tests/openssl.cnf | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 08ef7b732c..1781cc1776 100755 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -918,7 +918,7 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option req->digest = req->md_alg = EVP_get_digestbyname(req->digest_name); } if (req->md_alg == NULL) { - req->md_alg = req->digest = EVP_md5(); + req->md_alg = req->digest = EVP_sha1(); } PHP_SSL_CONFIG_SYNTAX_CHECK(extensions_section); diff --git a/ext/openssl/tests/openssl.cnf b/ext/openssl/tests/openssl.cnf index 6ba37cb953..4ed40fdc8a 100644 --- a/ext/openssl/tests/openssl.cnf +++ b/ext/openssl/tests/openssl.cnf @@ -3,7 +3,6 @@ default_bits = 1024 default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes -default_md = sha1 x509_extensions = v3_ca # The extensions to add to the self signed cert string_mask = MASK:4294967295 |