summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Collapse)AuthorAgeFilesLines
* Happy New YearXinchen Hui2013-01-013-3/+3
|
* Merge branch 'PHp-5.4'Stanislav Malyshev2012-09-151-1/+31
|\ | | | | | | | | | | * PHp-5.4: news for bug #61421 commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification
| * commit for php bug 61421Mark Jones2012-09-151-1/+31
| | | | | | | | enabling SHA2 and RMD160 for openssl signature verification
| * Revert "Add PBKDF2 support via openssl()"Stanislav Malyshev2012-06-123-93/+0
| | | | | | | | | | This reverts commit b5b8ea1050837fba5a6cee55e41b4574ed64158e. Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
| * Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound ↵Stanislav Malyshev2012-06-125-32/+32
| | | | | | | | | | | | | | like a spell." This reverts commit bccd1e672fabc3c788e93075221d47d9f077b167. Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
* | One more timeScott MacVicar2012-06-111-3/+0
| |
* | Merge branch '5.4'Scott MacVicar2012-06-111-0/+4
|\ \ | |/ | | | | | | | | | | | | | | * 5.4: Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell. Add PBKDF2 support via openssl() Conflicts: ext/openssl/openssl.c
| * Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar2012-06-115-32/+32
| | | | | | | | | | Summary: Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
| * Add PBKDF2 support via openssl()Scott MacVicar2012-06-113-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Add PBKDF2 support via openssl()Scott MacVicar2012-06-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar2012-06-115-32/+32
| | | | | | | | | | Summary: Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
* | - Fixed build (PKCS5_PBKDF2_HMAC is from 1.0.0)Felipe Pena2012-06-112-2/+10
| |
* | Merge branch '5.4'Scott MacVicar2012-06-113-0/+85
|\ \ | | | | | | | | | | | | * 5.4: Add PBKDF2 support via openssl()
| * | Add PBKDF2 support via openssl()Scott MacVicar2012-06-113-0/+85
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'PHP-5.4'Anatoliy Belsky2012-03-281-2/+2
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: Fix bug #61401 ext\openssl\tests\004.phpt fails Fix bug #61404 ext\openssl\tests\021.phpt fails Fix bug #61404 ext\openssl\tests\021.phpt fails Fix bug #61448 intl tests fail with icu >= 4.8
| * Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-03-281-2/+2
| |\ | | | | | | | | | | | | | | | | | | * PHP-5.3: Fix bug #61401 ext\openssl\tests\004.phpt fails Fix bug #61404 ext\openssl\tests\021.phpt fails Fix bug #61448 intl tests fail with icu >= 4.8
| | * Fix bug #61401 ext\openssl\tests\004.phpt failsAnatoliy Belsky2012-03-281-2/+2
| | |
| | * Fix bug #61404 ext\openssl\tests\021.phpt failsAnatoliy Belsky2012-03-281-5/+8
| | |
| * | Fix bug #61404 ext\openssl\tests\021.phpt failsAnatoliy Belsky2012-03-281-5/+8
| | |
* | | Fix bug #61404 ext\openssl\tests\021.phpt failsAnatoliy Belsky2012-03-281-5/+8
| | |
* | | Merge branch '5.4'Anatoliy Belsky2012-03-271-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | * 5.4: Fix bug #61405 ext\openssl\tests\022.phpt fails Fix bug #61412 ext\openssl\tests\bug28382.phpt fails Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
| * | Merge branch '5.3' into 5.4Anatoliy Belsky2012-03-271-2/+5
| |\ \ | | |/ | | | | | | | | | | | | * 5.3: Fix bug #61405 ext\openssl\tests\022.phpt fails Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
| | * Fix bug #61405 ext\openssl\tests\022.phpt failsAnatoliy Belsky2012-03-271-2/+5
| | |
| | * Fix bug #61412 ext\openssl\tests\bug28382.phpt failsAnatoliy Belsky2012-03-271-3/+6
| | |
| * | Fix bug #61412 ext\openssl\tests\bug28382.phpt failsAnatoliy Belsky2012-03-271-3/+6
| | |
* | | Merge branch '5.4'Anatoliy Belsky2012-03-271-3/+6
|\ \ \ | | | | | | | | | | | | | | | | * 5.4: Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
| * \ \ Merge branch '5.3' into 5.4Anatoliy Belsky2012-03-271-3/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | * 5.3: Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
| | * | Fix bug #61412 ext\openssl\tests\bug28382.phpt failsAnatoliy Belsky2012-03-271-3/+6
| | |/
| | * test for bug #61124Olivier DOUCET2012-02-251-0/+12
| | |
| | * Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).Scott MacVicar2012-02-231-0/+4
| | |
| | * Fix OpenSSL version-dependent diff. "Time Stamp signing" is not in openssl ↵Christopher Jones2012-02-072-1/+279
| | | | | | | | | | | | 0.9. Skip current test for 0.9. New test for 0.9 approved by Stas
| | * Another openssl test that is dependent on the openssl version. The output hasRasmus Lerdorf2012-02-051-5/+23
| | | | | | | | | | | | | | | | | | changed in more recent versions. Synch with newer output and consider changing the test to only pick out the more stable fields instead of all of them.
| | * Need EXPECTF here, of courseRasmus Lerdorf2012-02-051-1/+1
| | |
| | * Getting different hashes here. But this test isn't testing the hashes,Rasmus Lerdorf2012-02-051-1/+1
| | | | | | | | | | | | | | | it is just making sure we actually get a hash and don't crash.
| | * According to the reports on qa this test is failing the same way for everyone.Rasmus Lerdorf2012-02-051-1/+3
| | | | | | | | | | | | | | | | | | | | | See: http://qa.php.net/reports/viewreports.php?version=5.3.10&test=%2Fext%2Fopenssl%2Ftests%2Fbug28382.phpt I'm not sure if this is due to a change in the openssl library or in the extension, so perhaps the test itself needs to change, but for now synch it with the new output and watch for failures.
| | * - Year++Felipe Pena2012-01-013-3/+3
| | |
| | * Add tests for OpenSSL crash.Scott MacVicar2011-12-191-0/+13
| | |
| | * Fix segfault in older versions of OpenSSL (before 0.9.8i)Scott MacVicar2011-12-181-1/+3
| | |
| | * - Fixed NULL pointer dereference in stream_socket_enable_crypto, case whenMateusz Kocielski2011-11-121-0/+2
| | | | | | | | | | | | | | | | | | ssl_handle of session_stream is not initialized.
| | * - ext/openssl/tests/bug36732.phpt more portable.Gustavo André dos Santos Lopes2011-09-142-1/+45
| | |
| | * Fix the path to the .pemHannes Magnusson2011-09-081-2/+2
| | |
| | * - Revert r313616 (When we have a blocking SSL socket, respect the timeoutJohannes Schlüter2011-08-221-37/+0
| | | | | | | | | | | | | | | | | | | | | | | | option, scottmac) # This caused bug #55283, we should investigate a proper solution without # breaking anything.
| | * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| | |
| | * When we have a blocking SSL socket, respect the timeout option.Scott MacVicar2011-07-231-0/+37
| | | | | | | | | | | | | | | | | | | | | reading from SSL sockets could block indefinitely due to the lack of timeout
| | * removing openssl test for bug #55169 per Scott MacVicar's request; duplicate ↵Ryan Biesemeyer2011-07-201-43/+0
| | | | | | | | | | | | coverage of opensssl_random_pseudo_bytes.phpt
| | * update test for bug #55169, fix skipifRyan Biesemeyer2011-07-201-1/+3
| | |
| | * update test for bug #55169, don't require the extension in INIRyan Biesemeyer2011-07-201-2/+0
| | |
| | * tests for bug #55169 (mcrypt and openssl)Ryan Biesemeyer2011-07-201-0/+43
| | |
| | * openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to ↵Scott MacVicar2011-07-191-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * - did I not kill that already? (do not use rand_screen, pointless on server ↵Pierre Joye2011-06-161-4/+0
| | | | | | | | | | | | and not TS)
View Lorry Controller Status