- MFH: Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode)

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 61bfdfd7f734346bf2e8f5f703867bbf035cca90..ef4aaeac1549ceb74684c38b312727eee96a8a86 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -1196,7 +1196,7 @@ static void php_mcrypt_do_crypt(char* cipher, const char *key, int key_len, cons
 {
        char *cipher_dir_string;
        char *module_dir_string;
-       int block_size, max_key_length, use_key_length, i, count, iv_size, req_iv;
+       int block_size, max_key_length, use_key_length, i, count, iv_size;
        unsigned long int data_size;
        int *key_length_sizes;
        char *key_s = NULL, *iv_s;
@@ -1244,16 +1244,17 @@ static void php_mcrypt_do_crypt(char* cipher, const char *key, int key_len, cons
        /* Check IV */
        iv_s = NULL;
        iv_size = mcrypt_enc_get_iv_size (td);
-       req_iv = mcrypt_enc_mode_has_iv(td);
-       if (argc == 5) {
-               if (iv_size != iv_len) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
-               } else {
-                       iv_s = emalloc(iv_size + 1);
-                       memcpy(iv_s, iv, iv_size);
-               }
-       } else if (argc == 4) {
-               if (req_iv == 1) {
+       
+       /* IV is required */
+       if (mcrypt_enc_mode_has_iv(td) == 1) {
+               if (argc == 5) {
+                       if (iv_size != iv_len) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
+                       } else {
+                               iv_s = emalloc(iv_size + 1);
+                               memcpy(iv_s, iv, iv_size);
+                       }
+               } else if (argc == 4) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to use an empty IV, which is NOT recommend");
                        iv_s = emalloc(iv_size + 1);
                        memset(iv_s, 0, iv_size + 1);

diff --git a/ext/mcrypt/tests/bug46010.phpt b/ext/mcrypt/tests/bug46010.phpt
new file mode 100644 (file)
index 0000000..5aeb311
--- /dev/null
+++ b/ext/mcrypt/tests/bug46010.phpt
@@ -0,0 +1,14 @@
+--TEST---
+Bug #46010 (warnings incorrectly generated for iv in ecb mode)
+--FILE--
+<?php
+
+var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB)));
+var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB, "a")));
+var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB, "12345678")));
+
+?>
+--EXPECTF--
+string(16) "372eeb4a524b8d31"
+string(16) "372eeb4a524b8d31"
+string(16) "372eeb4a524b8d31"