com php-src: Use correct type for tag_len: ext/openssl/op enssl.c

From: Date: Sun, 01 Nov 2015 13:19:52 +0000
Subject: com php-src: Use correct type for tag_len: ext/openssl/op enssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92491@lists.php.net to get a copy of this message
Commit: c09f3e399eab84ff9ae000110314de4b155bbea4 Author: Jakub Zelenka <bukka@php.net> Sun, 1 Nov 2015 13:19:52 +0000 Parents: 19e60a1f52afc14b58df65539f2223484379718b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c09f3e399eab84ff9ae000110314de4b155bbea4 Log: Use correct type for tag_len Changed paths: M ext/openssl/openssl.c Diff: diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 2ea4a10..9a12941 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -5289,9 +5289,9 @@ static int php_openssl_cipher_init(const EVP_CIPHER *cipher_type, EVP_CIPHER_CTX Encrypts given data with given method and key, returns raw or base64 encoded string */ PHP_FUNCTION(openssl_encrypt) { - zend_long options = 0; + zend_long options = 0, tag_len = 16; char *data, *method, *password, *iv = "", *aad = ""; - size_t data_len, method_len, password_len, iv_len = 0, max_iv_len, aad_len = 0, tag_len = 16; + size_t data_len, method_len, password_len, iv_len = 0, max_iv_len, aad_len = 0; zval *tag; const EVP_CIPHER *cipher_type; EVP_CIPHER_CTX *cipher_ctx;

« previous php.cvs (#92491) next »