summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull-request/341'Stanislav Malyshev2013-06-102-2/+2
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-02-172-0/+26
|\
| * fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publ...Stanislav Malyshev2013-02-172-0/+26
* | Merge branch 'PHP-5.4' into PHP-5.5Lars Strojny2013-01-311-0/+12
|\ \ | |/
| * NEWS entry new OpenSSL option [doc]Lars Strojny2013-01-311-1/+1
| * Added ssl context option, "disable_compression"Daniel Lowrey2013-01-311-0/+12
| * Happy New YearXinchen Hui2013-01-013-3/+3
* | Happy New YearXinchen Hui2013-01-013-3/+3
* | Merge branch 'PHp-5.4'Stanislav Malyshev2012-09-151-1/+31
|\ \ | |/
| * commit for php bug 61421Mark Jones2012-09-151-1/+31
| * Revert "Add PBKDF2 support via openssl()"Stanislav Malyshev2012-06-123-93/+0
| * Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound li...Stanislav Malyshev2012-06-125-32/+32
* | One more timeScott MacVicar2012-06-111-3/+0
* | Merge branch '5.4'Scott MacVicar2012-06-111-0/+4
|\ \ | |/
| * Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar2012-06-115-32/+32
| * Add PBKDF2 support via openssl()Scott MacVicar2012-06-113-0/+93
* | Add PBKDF2 support via openssl()Scott MacVicar2012-06-111-1/+0
* | Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar2012-06-115-32/+32
* | - 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
|\ \
| * | Add PBKDF2 support via openssl()Scott MacVicar2012-06-113-0/+85
| |/
* | Merge branch 'PHP-5.4'Anatoliy Belsky2012-03-281-2/+2
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-03-281-2/+2
| |\
| | * 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
|\ \ \ | |/ /
| * | Merge branch '5.3' into 5.4Anatoliy Belsky2012-03-271-2/+5
| |\ \ | | |/
| | * 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
|\ \ \
| * \ \ Merge branch '5.3' into 5.4Anatoliy Belsky2012-03-271-3/+6
| |\ \ \ | | |/ / | |/| |
| | * | 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 0....Christopher Jones2012-02-072-1/+279
| | * Another openssl test that is dependent on the openssl version. The output hasRasmus Lerdorf2012-02-051-5/+23
| | * 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
| | * According to the reports on qa this test is failing the same way for everyone.Rasmus Lerdorf2012-02-051-1/+3
| | * - 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
| | * - 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
| | * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1