com php-src: Comment out warning when cipher update fail: ext/openssl/openssl.c

From: Date: Sun, 03 Jan 2016 17:24:06 +0000
Subject: com php-src: Comment out warning when cipher update fail: ext/openssl/openssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92480@lists.php.net to get a copy of this message
Commit: 651e6b628b9588674367b892106c76eeb11f4353 Author: Jakub Zelenka <bukka@php.net> Sun, 3 Jan 2016 17:24:06 +0000 Parents: 72381b09eab86a07b63146bff950466a60154f95 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=651e6b628b9588674367b892106c76eeb11f4353 Log: Comment out warning when cipher update fail There has never been any warning for that Changed paths: M ext/openssl/openssl.c Diff: diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index ec3acc3..a6abcb9 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -5364,11 +5364,13 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type, if ((!enc || data_len > 0) && !EVP_CipherUpdate(cipher_ctx, (unsigned char*)ZSTR_VAL(*poutbuf), &i, (unsigned char *)data, (int)data_len)) { + /* we don't show warning when we fail but if we ever do, then it should look like this: if (mode->is_single_run_aead && !enc) { php_error_docref(NULL, E_WARNING, "Tag verifycation failed"); } else { php_error_docref(NULL, E_WARNING, enc ? "Encryption failed" : "Decryption failed"); } + */ zend_string_release(*poutbuf); return FAILURE; }

« previous php.cvs (#92480) next »