com php-src: Correctly store OpenSSL erorrs for encrypt_key : ext/openssl/openssl.c
| From: | Jakub Zelenka | Date: | Sun, 03 Apr 2016 18:54:39 +0000 |
| Subject: | com php-src: Correctly store OpenSSL erorrs for encrypt_key : ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92440@lists.php.net to get a copy of this message | ||
Commit: df85331220ac60391d5f8d82c42a6c699f47fca1
Author: Jakub Zelenka <bukka@php.net> Sun, 3 Apr 2016 19:54:39 +0100
Parents: 79dd71b1517e97c1a7915a0eb150262248999f74
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=df85331220ac60391d5f8d82c42a6c699f47fca1
Log:
Correctly store OpenSSL erorrs for encrypt_key
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 60a3907..6d2dc33 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -989,9 +989,8 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option
str = CONF_get_string(req->req_config, req->section_name, "encrypt_rsa_key");
if (str == NULL) {
str = CONF_get_string(req->req_config, req->section_name, "encrypt_key");
- if (str == NULL) {
- php_openssl_store_errors();
- }
+ /* it is sure that there are some errrors as str was NULL for encrypt_rsa_key */
+ php_openssl_store_errors();
}
if (str != NULL && strcmp(str, "no") == 0) {
req->priv_key_encrypt = 0;