mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-23 00:40:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)

Browse Source
This commit is contained in:
Stanislav Malyshev 2020-09-26 22:08:52 -07:00
parent 311922ddbe
commit 2f5cb702ff
4 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/openssl/openssl.c
View File

@ -6441,11 +6441,6 @@ static int php_openssl_validate_iv(char **piv, size_t *piv_len, size_t iv_requir
{ {
char *iv_new; char *iv_new;
/* Best case scenario, user behaved */
if (*piv_len == iv_required_len) {
return SUCCESS;
}
if (mode->is_aead) { if (mode->is_aead) {
if (EVP_CIPHER_CTX_ctrl(cipher_ctx, mode->aead_ivlen_flag, *piv_len, NULL) != 1) { if (EVP_CIPHER_CTX_ctrl(cipher_ctx, mode->aead_ivlen_flag, *piv_len, NULL) != 1) {
php_error_docref(NULL, E_WARNING, "Setting of IV length for AEAD mode failed"); php_error_docref(NULL, E_WARNING, "Setting of IV length for AEAD mode failed");
@ -6454,6 +6449,11 @@ static int php_openssl_validate_iv(char **piv, size_t *piv_len, size_t iv_requir
return SUCCESS; return SUCCESS;
} }
/* Best case scenario, user behaved */
if (*piv_len == iv_required_len) {
return SUCCESS;
}
iv_new = ecalloc(1, iv_required_len + 1); iv_new = ecalloc(1, iv_required_len + 1);
if (*piv_len == 0) { if (*piv_len == 0) {

21
ext/openssl/tests/cipher_tests.inc
View File

@ -1,5 +1,26 @@
<?php <?php
$php_openssl_cipher_tests = array( $php_openssl_cipher_tests = array(
'aes-128-ccm' => array(
array(
'key' => '404142434445464748494a4b4c4d4e4f',
'iv' => '1011121314151617',
'aad' => '000102030405060708090a0b0c0d0e0f',
'tag' => '1fc64fbfaccd',
'pt' => '202122232425262728292a2b2c2d2e2f',
'ct' => 'd2a1f0e051ea5f62081a7792073d593d',
),
array(
'key' => '404142434445464748494a4b4c4d4e4f',
'iv' => '101112131415161718191a1b',
'aad' => '000102030405060708090a0b0c0d0e0f' .
'10111213',
'tag' => '484392fbc1b09951',
'pt' => '202122232425262728292a2b2c2d2e2f' .
'3031323334353637',
'ct' => 'e3b201a9f5b71a7a9b1ceaeccd97e70b' .
'6176aad9a4428aa5',
),
),
'aes-256-ccm' => array( 'aes-256-ccm' => array(
array( array(
'key' => '1bde3251d41a8b5ea013c195ae128b21' . 'key' => '1bde3251d41a8b5ea013c195ae128b21' .

22
ext/openssl/tests/openssl_decrypt_ccm.phpt
View File

@ -10,14 +10,16 @@ if (!in_array('aes-256-ccm', openssl_get_cipher_methods()))
--FILE-- --FILE--
<?php <?php
require_once __DIR__ . "/cipher_tests.inc"; require_once __DIR__ . "/cipher_tests.inc";
$method = 'aes-256-ccm'; $methods = ['aes-128-ccm', 'aes-256-ccm'];
$tests = openssl_get_cipher_tests($method);
foreach ($tests as $idx => $test) { foreach ($methods as $method) {
echo "TEST $idx\n"; $tests = openssl_get_cipher_tests($method);
$pt = openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, foreach ($tests as $idx => $test) {
$test['iv'], $test['tag'], $test['aad']); echo "$method - TEST $idx\n";
var_dump($test['pt'] === $pt); $pt = openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
$test['iv'], $test['tag'], $test['aad']);
var_dump($test['pt'] === $pt);
}
} }
// no IV // no IV
@ -32,7 +34,11 @@ var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
?> ?>
--EXPECTF-- --EXPECTF--
TEST 0 aes-128-ccm - TEST 0
bool(true)
aes-128-ccm - TEST 1
bool(true)
aes-256-ccm - TEST 0
bool(true) bool(true)
Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed in %s on line %d Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed in %s on line %d

26
ext/openssl/tests/openssl_encrypt_ccm.phpt
View File

@ -10,15 +10,17 @@ if (!in_array('aes-256-ccm', openssl_get_cipher_methods()))
--FILE-- --FILE--
<?php <?php
require_once __DIR__ . "/cipher_tests.inc"; require_once __DIR__ . "/cipher_tests.inc";
$method = 'aes-256-ccm'; $methods = ['aes-128-ccm', 'aes-256-ccm'];
$tests = openssl_get_cipher_tests($method);
foreach ($tests as $idx => $test) { foreach ($methods as $method) {
echo "TEST $idx\n"; $tests = openssl_get_cipher_tests($method);
$ct = openssl_encrypt($test['pt'], $method, $test['key'], OPENSSL_RAW_DATA, foreach ($tests as $idx => $test) {
$test['iv'], $tag, $test['aad'], strlen($test['tag'])); echo "$method - TEST $idx\n";
var_dump($test['ct'] === $ct); $ct = openssl_encrypt($test['pt'], $method, $test['key'], OPENSSL_RAW_DATA,
var_dump($test['tag'] === $tag); $test['iv'], $tag, $test['aad'], strlen($test['tag']));
var_dump($test['ct'] === $ct);
var_dump($test['tag'] === $tag);
}
} }
// Empty IV error // Empty IV error
@ -32,7 +34,13 @@ var_dump(strlen($tag));
var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 16), $tag, '', 1024)); var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 16), $tag, '', 1024));
?> ?>
--EXPECTF-- --EXPECTF--
TEST 0 aes-128-ccm - TEST 0
bool(true)
bool(true)
aes-128-ccm - TEST 1
bool(true)
bool(true)
aes-256-ccm - TEST 0
bool(true) bool(true)
bool(true) bool(true)