-
Notifications
You must be signed in to change notification settings - Fork 8k
Properly initialize AEAD cipher flags in OpenSSL backend #20853
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jordikroon
wants to merge
5
commits into
php:master
Choose a base branch
from
jordikroon:fix/gh20851
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7de1357
properly initialize AEAD cipher flags in OpenSSL backend
jordikroon 59cba53
allow null AAD parameter in openssl_encrypt/decrypt
jordikroon ca12f45
Check for EVP_CIPH_SIV_MODE in switch
jordikroon 8ebc8fc
Update tests and introduce aad_supports_vector
jordikroon dd214a0
Fix switch statement
jordikroon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| --TEST-- | ||
| openssl_decrypt() with SIV cipher algorithm tests | ||
| --EXTENSIONS-- | ||
| openssl | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!in_array('aes-128-siv', openssl_get_cipher_methods())) | ||
| die("skip: aes-128-siv not available"); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| require_once __DIR__ . "/cipher_tests.inc"; | ||
| $method = 'aes-128-siv'; | ||
| $tests = openssl_get_cipher_tests($method); | ||
|
|
||
| foreach ($tests as $idx => $test) { | ||
| echo "TEST $idx\n"; | ||
| $pt = openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, | ||
| $test['iv'], $test['tag'], $test['aad']); | ||
| var_dump($test['pt'] === $pt); | ||
| } | ||
|
|
||
| // failed because no AAD | ||
| echo "TEST AAD\n"; | ||
| var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, | ||
| $test['iv'], $test['tag'])); | ||
| // failed because wrong tag | ||
| echo "TEST WRONGTAG\n"; | ||
| var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, | ||
| $test['iv'], str_repeat('x', 16), $test['aad'])); | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| TEST 0 | ||
| bool(true) | ||
| TEST 1 | ||
| bool(true) | ||
| TEST 2 | ||
| bool(true) | ||
| TEST AAD | ||
| bool(false) | ||
| TEST WRONGTAG | ||
| bool(false) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| --TEST-- | ||
| openssl_encrypt() with SIV cipher algorithm tests | ||
| --EXTENSIONS-- | ||
| openssl | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!in_array('aes-128-siv', openssl_get_cipher_methods())) | ||
| die("skip: aes-128-siv not available"); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| require_once __DIR__ . "/cipher_tests.inc"; | ||
| $method = 'aes-128-siv'; | ||
| $tests = openssl_get_cipher_tests($method); | ||
|
|
||
| foreach ($tests as $idx => $test) { | ||
| echo "TEST $idx\n"; | ||
| $ct = openssl_encrypt($test['pt'], $method, $test['key'], OPENSSL_RAW_DATA, | ||
| $test['iv'], $tag, $test['aad'], strlen($test['tag'])); | ||
| var_dump($test['ct'] === $ct); | ||
| var_dump($test['tag'] === $tag); | ||
| } | ||
|
|
||
| // Empty tag should not be equivalent to null tag | ||
| echo "TEST AAD\n"; | ||
| var_dump(openssl_encrypt('data', $method, 'password', 0, '', $tag, '') !== openssl_encrypt('data', $method, 'password', 0, '', $tag, null)); | ||
|
|
||
| // Failing to retrieve tag (max is 16 bytes) | ||
| var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 32), $tag, '', 20)); | ||
|
|
||
| // Failing when no tag supplied | ||
| var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 32))); | ||
| ?> | ||
| --EXPECTF-- | ||
| TEST 0 | ||
| bool(true) | ||
| bool(true) | ||
| TEST 1 | ||
| bool(true) | ||
| bool(true) | ||
| TEST 2 | ||
| bool(true) | ||
| bool(true) | ||
| TEST AAD | ||
| bool(true) | ||
|
|
||
| Warning: openssl_encrypt(): Retrieving verification tag failed in %s on line %d | ||
| bool(false) | ||
|
|
||
| Warning: openssl_encrypt(): A tag should be provided when using AEAD mode in %s on line %d | ||
| bool(false) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.