archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
127645 commits 526 branches 1434 tags 877 MiB
Commit graph

900 commits

Author SHA1 Message Date
Jakub Zelenka
67c1921e2b Merge branch 'PHP-5.6' into PHP-7.0 2016-01-25 17:19:18 +00:00
Jakub Zelenka
a63d0f55da Fix memory leak with not freeing OpenSSL errors 2016-01-25 16:50:16 +00:00
Jakub Zelenka
0e2a5cdc1a Store main errors in openssl_x509_parse 2016-01-22 16:43:23 +00:00
Jakub Zelenka
116d64ff58 Store errors in openssl_x509_fingerprint 2016-01-21 16:41:27 +00:00
Jakub Zelenka
555126e90b Store errors in openssl_x509_export 2016-01-20 20:31:09 +00:00
Jakub Zelenka
63f8ef6ee1 Store errors in OpenSSL SPKI functions 2016-01-19 19:43:48 +00:00
Jakub Zelenka
b5c990c39b Store errors for some OpenSSL RAND handling 2016-01-10 18:28:01 +00:00
Jakub Zelenka
fb3a7e0ef4 Add error storing to the OpenSSL CONF part 2016-01-10 17:38:49 +00:00
Jakub Zelenka
d5a148e237 Use and fix storing errors in openssl_x509_export_to_file 
Also use persistent memory to prevent segfualt
 2016-01-09 18:45:02 +00:00
Jakub Zelenka
19d40fc2b0 Implement logic for OpenSSL error storing 2016-01-09 17:45:08 +00:00
Jakub Zelenka
e453af3851 Warn about passing tag for non AEAD modes 2016-01-09 17:25:53 +00:00
Jakub Zelenka
1d111320b9 Add initial almost empty php_openssl_store_errors 2016-01-08 14:57:31 +00:00
Jakub Zelenka
e00ba47d40 Add global data for storing OpenSSL errors 2016-01-07 16:38:24 +00:00
Jakub Zelenka
ae0ce19fa8 Merge branch 'master' into openssl_aead 2016-01-06 14:43:07 +00:00
Jakub Zelenka
55abb5d395 Fix and test OpenSSL CCM decryption 2016-01-05 14:19:00 +00:00
Jakub Zelenka
9b95dd5e37 Merge branch 'PHP-7.0' 2016-01-04 16:53:30 +00:00
Jakub Zelenka
0ea63cb2a8 Fix small CS label issue in openssl.c 2016-01-04 16:52:52 +00:00
Dominic Luechinger
e4bdf51f0a Replaced whitespaces with tabs and fixed aligments 2016-01-04 16:46:32 +00:00
Jakub Zelenka
5897256d04 Fix and test OpenSSL CCM encryption 2016-01-04 14:07:19 +00:00
Jakub Zelenka
651e6b628b Comment out warning when cipher update fail 
There has never been any warning for that
 2016-01-03 17:24:06 +00:00
Jakub Zelenka
72381b09ea Fix arginfo for openssl_decrypt (tag is not ref) 2016-01-03 17:21:57 +00:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Jakub Zelenka
52ffdf9fc3 Test and fix encrypting empty IV for AEAD mode 2015-12-31 16:33:57 +00:00
Jakub Zelenka
5e9540f77d Add AES CCM ciphers when linked with OpenSSL 1.0.1 
These ciphers are not added by OpenSSL_add_all_algorithms in 1.0.1
 2015-12-27 18:03:36 +00:00
Jakub Zelenka
213844de49 Fix EVP_EncryptFinal and EVP_DecryptFinal 2015-12-26 20:33:03 +00:00
Tom Van Looy
618b961124 Remove leftovers of TSRMLS in code 2015-12-25 11:13:39 +01:00
Jakub Zelenka
fc3575aaf1 Retrieve tag in AEAD cipher mode encryption 2015-12-13 19:05:19 +00:00
Jakub Zelenka
c54174255d Simplify AAD condition 2015-12-07 19:19:44 +00:00
Jakub Zelenka
da0c2a4b6b Implement AAD setting 2015-12-06 20:09:41 +00:00
Jakub Zelenka
32495cbfdd Add php_openssl_cipher_update to group enc and dec logic 2015-12-04 20:27:18 +00:00
Jakub Zelenka
e74368a8a1 Set AEAD tag or tag_len if supplied 2015-12-03 19:16:11 +00:00
Jakub Zelenka
c993151115 Add AEAD IV init 2015-12-01 19:34:12 +00:00
Jakub Zelenka
4b22c063bf Move password checkign to php_openssl_cipher_init 2015-11-15 19:11:24 +00:00
Jakub Zelenka
dcabd9403a Move php_openssl_validate_iv to php_openssl_cipher_init and fix some issues 2015-11-08 18:03:17 +00:00
Jakub Zelenka
3ce5e46338 Change return value from php_openssl_validate_iv 2015-11-03 19:35:02 +00:00
Jakub Zelenka
2eb3e2c3ba Use php_openssl_cipher_init in openssl_decrypt 2015-11-02 21:39:38 +00:00
Jakub Zelenka
789ee143b2 Use php_openssl_cipher_init in openssl_encrypt 2015-11-01 13:30:42 +00:00
Jakub Zelenka
c09f3e399e Use correct type for tag_len 2015-11-01 13:19:52 +00:00
Jakub Zelenka
496c46942f Add php_openssl_cipher_init 2015-10-26 19:08:24 +00:00
Jakub Zelenka
054b27d3f2 Merge branch 'master' into openssl_aead 2015-10-26 18:36:06 +00:00
Jakub Zelenka
2ee99f8954 Check EVP_SealFinal return code 
This can be done since we no longer support OpenSSL 0.9.6
 2015-10-25 17:53:39 +00:00
Jakub Zelenka
a6534b8f73 Use openssl allocated cipher context 2015-10-07 20:18:33 +01:00
Dmitry Stogov
ad4fa8f758 Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). 2015-09-24 22:39:59 +03:00
Jakub Zelenka
2f744cd3c5 Add and use function for loading cipher mode info 2015-09-23 19:56:24 +01:00
Anatol Belski
ca89d9a797 expose openssl config path so it can be tested 2015-09-23 19:48:20 +02:00
Anatol Belski
15d43095d7 expose openssl config path so it can be tested 2015-09-23 14:17:03 +02:00
Jakub Zelenka
96698b5d6d Add and check AEAD params in openssl_encrypt and openssl_decrypt 2015-09-21 18:48:21 +01:00
Jakub Zelenka
2ed246ed89 Add an initial preparation for OpenSSL AEAD 2015-09-20 14:00:24 +01:00