clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,187 Commits 491 Branches 1,363 Tags 839 MiB
9d62807190
Commit Graph

226 Commits

Author SHA1 Message Date
Stanislav Malyshev
2874696a5a Fix CVE-2013-4073 - handling of certs with null bytes 2013-08-13 22:20:33 -07:00
Stanislav Malyshev
7b0107cc5d fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey() 2013-02-17 13:28:42 -08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Mark Jones
84202c367e commit for php bug 61421 
enabling SHA2 and RMD160 for openssl signature verification
 2012-09-15 22:59:34 -07:00
Stanislav Malyshev
c7be96b08f Revert "Add PBKDF2 support via openssl()" 
This reverts commit b5b8ea1050.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
 2012-06-12 11:22:49 -07:00
Stanislav Malyshev
a2bfad051d Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell." 
This reverts commit bccd1e672f.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
 2012-06-12 11:21:54 -07:00
Scott MacVicar
bccd1e672f Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell. 
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
 2012-06-11 15:41:41 -07:00
Scott MacVicar
b5b8ea1050 Add PBKDF2 support via openssl() 
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.

Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.

Will backport to 5.4 potentially with Stas' approval.

Test Plan:
Ran newly added tests which came from RFC 6070
 2012-06-11 13:35:25 -07:00
Scott MacVicar
5ef66f2cf5 Fixed bug #61124 (Crash when decoding an invalid base64 encoded string). 2012-02-23 01:26:46 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Stanislav Malyshev
2f15c1d717 fix uninitialized var that may lead to crash 2011-12-26 02:16:37 +00:00
Scott MacVicar
beda5efd41 Fix segfault in older versions of OpenSSL (before 0.9.8i) 2011-12-18 05:14:32 +00:00
Scott MacVicar
287e1917cf Make sure that we set the strong crypto result to false as well as returning false. 2011-12-07 20:50:33 +00:00
Gustavo André dos Santos Lopes
1d5028be3d - Fixed bug #55646: textual data is returned in UTF-8, but is input in 
another encoding. 5.4 only as this implies a BC break.
 2011-09-12 17:23:10 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierre Joye
b03817afb5 - re apply the rng change specific to windows, long term it should be a std function but as this function was badly introduced in the 1st place, we have to fix the bad things here instead, pls do not revert again, bad idea. 2011-07-19 23:01:41 +00:00
Scott MacVicar
591e0e446f Revert change to use a special Windows version of openssl_random_pseudo_bytes(). 
Lets discuss this on internals first. We're advertising something from the OpenSSL library 
and then subverting it with another Windows OS call.

What are the implications of this? Should we make this available in ext/standard/ instead?
 2011-07-19 22:29:55 +00:00
Scott MacVicar
64a0c79a07 openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to the default size for the case of a variable key length cipher. 
The result is a key of 448 bits being passed to the blowfish algorithm would be truncated to 128 bit.

Also fixed an error in the zend_parse_parameters() having an invalid character being used.
 2011-07-19 22:15:56 +00:00
Pierre Joye
5fb2570742 - use php_win32_get_random_bytes instead of over slow and partially wrong openssl's version 2011-07-10 14:59:33 +00:00
Pierre Joye
104cd28e95 - did I not kill that already? (do not use rand_screen, pointless on server and not TS) 2011-06-16 13:06:41 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Scott MacVicar
30f19bd524 Allow management of your own padding in openssl_encrypt/decrypt. 
For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
 2011-05-20 18:56:13 +00:00
Martin Jansen
0c8438462c The project calls itself OpenSSL and not openSSL, so let's keep it 
that way in our code as well.
 2011-04-25 16:50:30 +00:00
Rasmus Lerdorf
380c3e5127 SSLV2 patch cleanup 2011-04-24 23:27:48 +00:00
Pierre Joye
f922e31129 - fix bug #54061, memory leak in openssl_decrypt 2011-02-21 12:47:38 +00:00
Pierre Joye
b526a6ef44 - fix bug #54060, memory leak in openssl_encrypt 2011-02-21 10:07:31 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
3fd615cc8d - not TS and useless on server, also not required anymore with the supported windows versions 2010-12-02 11:37:43 +00:00
Felipe Pena
6e8c2ba690 - Fixed bug #53136 (Invalid read on openssl_csr_new()) 2010-11-12 23:34:03 +00:00
Adam Harvey
86944b47a6 Fix vim marker folds. 2010-10-13 09:23:39 +00:00
Ilia Alshanetsky
412d151681 Fixed extrenous warning inside openssl_encrypt() for cases where iv not provided, but algo does not require an iv 2010-10-07 12:32:00 +00:00
Pierre Joye
aa0ed267a2 - use TSRMLS_*C instead of TSRMLS_FETCH in zend_list_insert 2010-09-16 09:13:19 +00:00
Felipe Pena
80926568f1 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) 2010-06-26 16:03:39 +00:00
Pierre Joye
276f9a8678 - #48632, ssl AES support 2010-06-21 08:47:25 +00:00
Antony Dovgal
4463284456 fix ZTS build 2010-05-20 11:20:44 +00:00
Sara Golemon
340d57b13a Add parameter to openssl_(en|de)crypt 2010-05-19 20:05:09 +00:00
Ilia Alshanetsky
5d9b0a4a6f Removed double allocation of buffer inside openssl_random_pseudo_bytes() and cleanup code 2010-05-11 14:31:00 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Andrey Hristov
e9f9f66f2e Fix for bug #51647 Certificate file without private key (pk in another file) doesn't work 2010-04-23 13:54:40 +00:00
Antony Dovgal
4646062956 fix typo 2010-04-22 16:00:45 +00:00
Antony Dovgal
a15efa6979 revert most of the Andrey's patch that causes segfaults 
(as agreed with Pierre)
 2010-04-22 15:59:44 +00:00
Antony Dovgal
64a97ee663 initialize variable. this code still segfaults in OpenSSL, no idea why 2010-04-22 11:56:08 +00:00
Andrey Hristov
c04f752625 Fix for bug#49234 method not found ssl_set 
Patch was tested and compiles on Windows. (Thanks Kalle)
 2010-04-15 11:01:30 +00:00
Kalle Sommer Nielsen
7ef4cdf471 Remove a couple TSRMLS_FETCH() calls around ext/main/sapi 2010-04-13 11:02:15 +00:00
Ilia Alshanetsky
eb1dc0babf Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation) 2010-01-27 12:55:01 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Arnaud Le Blanc
7c0803a8ca merge from trunk: openssl sni support (rev 289831) 2009-11-30 13:31:53 +00:00
Guenter Knauf
04448f215b added timezone define for NetWare. 2009-11-03 21:26:39 +00:00
Felipe Pena
361d6789f1 - Fixed memory leak in openssl_pkcs12_export_to_file() 2009-10-27 21:37:03 +00:00
Ilia Alshanetsky
62d78d7ccc Fixed certificate validation inside php_openssl_apply_verification_policy 2009-09-14 12:50:30 +00:00