Skip to content

OpenSSL AEAD support #1716

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.

Sign up for GitHub

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

Merged
merged 43 commits into from
Jun 19, 2016
Merged

OpenSSL AEAD support #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2ed246e
Add an initial preparation for OpenSSL AEAD
bukka Sep 20, 2015
96698b5
Add and check AEAD params in openssl_encrypt and openssl_decrypt
bukka Sep 21, 2015
2f744cd
Add and use function for loading cipher mode info
bukka Sep 23, 2015
a6534b8
Use openssl allocated cipher context
bukka Oct 7, 2015
054b27d
Merge branch 'master' into openssl_aead
bukka Oct 26, 2015
496c469
Add php_openssl_cipher_init
bukka Oct 26, 2015
6418786
Merge branch 'master' of git.php.net:php-src into openssl_aead
bukka Oct 29, 2015
19e60a1
Merge branch 'master' into openssl_aead
bukka Nov 1, 2015
c09f3e3
Use correct type for tag_len
bukka Nov 1, 2015
789ee14
Use php_openssl_cipher_init in openssl_encrypt
bukka Nov 1, 2015
2eb3e2c
Use php_openssl_cipher_init in openssl_decrypt
bukka Nov 2, 2015
3ce5e46
Change return value from php_openssl_validate_iv
bukka Nov 3, 2015
dcabd94
Move php_openssl_validate_iv to php_openssl_cipher_init and fix some …
bukka Nov 8, 2015
3fb12d2
Merge branch 'master' of git.php.net:php-src into openssl_aead
bukka Nov 9, 2015
be57caf
Merge branch 'master' of git.php.net:php-src into openssl_aead
bukka Nov 15, 2015
4b22c06
Move password checkign to php_openssl_cipher_init
bukka Nov 15, 2015
55b5160
Merge branch 'master' into openssl_aead
bukka Nov 29, 2015
c993151
Add AEAD IV init
bukka Dec 1, 2015
e74368a
Set AEAD tag or tag_len if supplied
bukka Dec 3, 2015
32495cb
Add php_openssl_cipher_update to group enc and dec logic
bukka Dec 4, 2015
da0c2a4
Implement AAD setting
bukka Dec 6, 2015
c541742
Simplify AAD condition
bukka Dec 7, 2015
fc3575a
Retrieve tag in AEAD cipher mode encryption
bukka Dec 13, 2015
213844d
Fix EVP_EncryptFinal and EVP_DecryptFinal
bukka Dec 26, 2015
5e9540f
Add AES CCM ciphers when linked with OpenSSL 1.0.1
bukka Dec 27, 2015
a00d1ec
Add an initial openssl encrypt GCM test
bukka Dec 28, 2015
8070e04
Add more aes-128-gcm test vectors
bukka Dec 29, 2015
74f2998
Add an initial openssl decrypt GCM test
bukka Dec 30, 2015
52ffdf9
Test and fix encrypting empty IV for AEAD mode
bukka Dec 31, 2015
a866503
Test invalid auth tag length in encryption
bukka Jan 2, 2016
72381b0
Fix arginfo for openssl_decrypt (tag is not ref)
bukka Jan 3, 2016
651e6b6
Comment out warning when cipher update fail
bukka Jan 3, 2016
8daecc5
Test error cases in openssl_decrypt for GCM mode
bukka Jan 3, 2016
5897256
Fix and test OpenSSL CCM encryption
bukka Jan 4, 2016
55abb5d
Fix and test OpenSSL CCM decryption
bukka Jan 5, 2016
ae0ce19
Merge branch 'master' into openssl_aead
bukka Jan 6, 2016
e453af3
Warn about passing tag for non AEAD modes
bukka Jan 9, 2016
7014109
Merge branch 'master' into openssl_aead
bukka Feb 29, 2016
7a4cc73
Merge branch 'openssl_error_store' into openssl_aead_with_error_store
bukka Feb 29, 2016
e63a854
Merge branch 'openssl_error_store' into openssl_aead
bukka Jun 19, 2016
af79a58
Merge branch 'openssl_error_store' into openssl_aead
bukka Jun 19, 2016
e7637e5
Merge branch 'openssl_error_store' into openssl_aead
bukka Jun 19, 2016
26abb1b
Add NEWS entry about OpenSSL AEAD
bukka Jun 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ PHP NEWS
. Fixed bug #72399 (Use-After-Free in MBString (search_re)). (Laruence)

- OpenSSL:
. Implemented FR #67304 (Added AEAD support [CCM and GCM modes] to
openssl_encrypt and openssl_decrypt). (Jakub Zelenka)
. Implemented error storing to the global queue and cleaning up the OpenSSL
error queue (resolves bugs #68276 and #69882). (Jakub Zelenka)

Expand Down
Loading