summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Expand)AuthorAgeFilesLines
* Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-2/+2
* Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-111-1/+1
|\
| * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-12-111-1/+1
| |\
| | * fix dir separator in cve-2013-6420 testAnatol Belski2013-12-111-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-103-4/+61
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-12-103-4/+61
| |\ \ | | |/
| | * Fix CVE-2013-6420 - memory corruption in openssl_x509_parseStanislav Malyshev2013-12-103-4/+61
* | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-10-091-12/+14
|\ \ \ | |/ /
| * | C89 compatibilityMichael Wallner2013-10-091-12/+14
* | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-10-091-5/+6
|\ \ \ | |/ /
| * | Fixed segfault when built with OpenSSL >= 1.0.1Daniel Lowrey2013-10-091-5/+6
* | | Remove compile warning:Christopher Jones2013-08-191-1/+1
* | | Remove compile warnings:Christopher Jones2013-08-191-2/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-191-0/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-08-191-0/+1
| |\ \ | | |/
| | * fix using wrong buffer pointerStanislav Malyshev2013-08-191-0/+1
| | * Fix CVE-2013-4073 - handling of certs with null bytesStanislav Malyshev2013-08-133-2/+131
| | * Happy New Year~Xinchen Hui2013-01-013-3/+3
| | * Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 onlyAnatoliy Belsky2012-04-241-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-183-30/+112
|\ \ \ | |/ /
| * | Fix for php bug #64802 includes test caseMark Jones2013-08-183-30/+112
* | | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-142-2/+2
|\ \ \ | |/ /
| * | Reduce (some) compile noise of 'unused variable' and 'may be used uninitializ...Christopher Jones2013-08-142-2/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-133-2/+131
|\ \ \ | |/ /
| * | Fix CVE-2013-4073 - handling of certs with null bytesStanislav Malyshev2013-08-133-2/+131
| * | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-102-2/+2
* | | Fix long-standing visual pain point: the misalignment of './configure help' t...Christopher Jones2013-08-061-1/+1
* | | fix missing includeAnatol Belski2013-07-231-0/+3
* | | 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
|\ \ \ | |/ /