diff options
| author | Remi Collet <remi@php.net> | 2014-03-14 09:52:02 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-03-14 09:52:02 +0100 |
| commit | e1d8c0a0516ca844299490855bf13bb8433ca0b9 (patch) | |
| tree | dac79b458f8613e5adc1f419b4991e752b688e51 | |
| parent | db6c33875ca87673e33f02706dd8d4c42a07d59f (diff) | |
| parent | 87a87c668207ee3a1f6a9352c28eaf2cbc6e371e (diff) | |
| download | php-git-e1d8c0a0516ca844299490855bf13bb8433ca0b9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #66833 Default digest algo is still MD5
| -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 374f886e44..e887ca7697 100755 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -870,7 +870,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 |