com php-src: Merge branch 'master' into openssl_aead: ext /openssl/openssl.c
| From: | Jakub Zelenka | Date: | Mon, 29 Feb 2016 19:31:20 +0000 |
| Subject: | com php-src: Merge branch 'master' into openssl_aead: ext /openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92472@lists.php.net to get a copy of this message | ||
Commit: 70141093a731049ee9220e9e965f61ded56ed4d5
Author: Jakub Zelenka <bukka@php.net> Mon, 29 Feb 2016 19:31:20 +0000
Parents: e453af3851daf08f5af9b45fc7819c3a9c336f1e 97294aca7e066443291cc2d77f8674ac23eabb32
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=70141093a731049ee9220e9e965f61ded56ed4d5
Log:
Merge branch 'master' into openssl_aead
Changed paths:
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index cc25061,4a096f7..abe2284
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -5268,19 -5213,14 +5273,19 @@@ static int php_openssl_validate_iv(cha
}
if (*piv_len < iv_required_len) {
- php_error_docref(NULL, E_WARNING, "IV passed is only %zd bytes long, cipher expects an IV
of precisely %zd bytes, padding with \\0", *piv_len, iv_required_len);
+ php_error_docref(NULL, E_WARNING,
- "IV passed is only %d bytes long, cipher expects an IV of precisely %d bytes, padding
with \\0",
++ "IV passed is only %zd bytes long, cipher expects an IV of precisely %zd bytes, padding
with \\0",
+ *piv_len, iv_required_len);
memcpy(iv_new, *piv, *piv_len);
*piv_len = iv_required_len;
*piv = iv_new;
- return 1;
+ *free_iv = 1;
+ return SUCCESS;
}
- php_error_docref(NULL, E_WARNING, "IV passed is %zd bytes long which is longer than the %zd
expected by selected cipher, truncating", *piv_len, iv_required_len);
+ php_error_docref(NULL, E_WARNING,
- "IV passed is %d bytes long which is longer than the %d expected by selected cipher,
truncating",
++ "IV passed is %zd bytes long which is longer than the %zd expected by selected cipher,
truncating",
+ *piv_len, iv_required_len);
memcpy(iv_new, *piv, iv_required_len);
*piv_len = iv_required_len;
*piv = iv_new;