diff options
Diffstat (limited to 'ext/mcrypt')
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 8 | ||||
| -rw-r--r-- | ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt | 2 | ||||
| -rw-r--r-- | ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt | 2 | ||||
| -rw-r--r-- | ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt | 4 | ||||
| -rw-r--r-- | ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt | 2 | ||||
| -rw-r--r-- | ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 5fc632b05..f336ba8b7 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -578,8 +578,11 @@ PHP_FUNCTION(mcrypt_generic_init) if (iv_len != iv_size) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Iv size incorrect; supplied length: %d, needed: %d", iv_len, iv_size); + if (iv_len > iv_size) { + iv_len = iv_size; + } } - memcpy(iv_s, iv, iv_size); + memcpy(iv_s, iv, iv_len); mcrypt_generic_deinit(pm->td); result = mcrypt_generic_init(pm->td, key_s, key_size, iv_s); @@ -600,8 +603,9 @@ PHP_FUNCTION(mcrypt_generic_init) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error"); break; } + } else { + pm->init = 1; } - pm->init = 1; RETVAL_LONG(result); efree(iv_s); diff --git a/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt b/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt index e718107b9..ace9f829d 100644 --- a/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt +++ b/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt @@ -23,7 +23,7 @@ $cipher = MCRYPT_TRIPLEDES; $data = b"This is the secret message which must be encrypted"; $mode = MCRYPT_DECRYPT; -// tripledes uses keys upto 192 bits (24 bytes) +// tripledes uses keys up to 192 bits (24 bytes) $keys = array( b'12345678', b'12345678901234567890', diff --git a/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt b/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt index 7e2957977..65ef3ad8e 100644 --- a/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt +++ b/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt @@ -23,7 +23,7 @@ $cipher = MCRYPT_TRIPLEDES; $data = b"This is the secret message which must be encrypted"; $mode = MCRYPT_ENCRYPT; -// tripledes uses keys upto 192 bits (24 bytes) +// tripledes uses keys up to 192 bits (24 bytes) $keys = array( b'12345678', b'12345678901234567890', diff --git a/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt b/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt index 51a64943b..8b3cbd836 100644 --- a/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt +++ b/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt @@ -21,13 +21,13 @@ echo "*** Testing mcrypt_encrypt() : TripleDES functionality ***\n"; //test tripledes, aes //test different lengths of key, iv //test no iv being passed on CBC, ECB -//test upto 32 bytes with unlimited strength +//test up to 32 bytes with unlimited strength $cipher = MCRYPT_TRIPLEDES; $mode = MCRYPT_MODE_CBC; $data = b'This is the secret message which must be encrypted'; -// tripledes uses keys upto 192 bits (24 bytes) +// tripledes uses keys up to 192 bits (24 bytes) $keys = array( b'12345678', b'12345678901234567890', diff --git a/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt b/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt index 941eb7935..ea6b2c216 100644 --- a/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt +++ b/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt @@ -20,7 +20,7 @@ $cipher = MCRYPT_TRIPLEDES; $mode = MCRYPT_MODE_ECB; $data = b'This is the secret message which must be encrypted'; -// tripledes uses keys upto 192 bits (24 bytes) +// tripledes uses keys up to 192 bits (24 bytes) $keys = array( b'12345678', b'12345678901234567890', diff --git a/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt b/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt index 621f7b1db..5f5a4bea5 100644 --- a/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt +++ b/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt @@ -30,7 +30,7 @@ $cipher = MCRYPT_RIJNDAEL_128; $mode = MCRYPT_MODE_CBC; $data = b'This is the secret message which must be encrypted'; -// keys upto 128 bits (16 bytes) +// keys up to 128 bits (16 bytes) $keys = array( null, '', |