summaryrefslogtreecommitdiff
path: root/ext/openssl/openssl.c
Commit message (Collapse)AuthorAgeFilesLines
* Happy New YearXinchen Hui2013-01-011-1/+1
|
* 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-121-65/+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-121-4/+4
| | | | | | | | | | | | | | 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-111-4/+4
| | | | | | | | | | Summary: Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
| * Add PBKDF2 support via openssl()Scott MacVicar2012-06-111-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-4/+4
| | | | | | | | | | 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-111-1/+9
| |
* | Merge branch '5.4'Scott MacVicar2012-06-111-0/+57
|\ \ | | | | | | | | | | | | * 5.4: Add PBKDF2 support via openssl()
| * | Add PBKDF2 support via openssl()Scott MacVicar2012-06-111-0/+57
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).Scott MacVicar2012-02-231-0/+4
| |
| * - Year++Felipe Pena2012-01-011-1/+1
| |
| * fix uninitialized var that may lead to crashStanislav Malyshev2011-12-261-126/+126
| |
| * Fix segfault in older versions of OpenSSL (before 0.9.8i)Scott MacVicar2011-12-181-1/+3
| |
| * Make sure that we set the strong crypto result to false as well as returning ↵Scott MacVicar2011-12-071-1/+7
| | | | | | | | false.
| * - Fixed bug #55646: textual data is returned in UTF-8, but is input inGustavo André dos Santos Lopes2011-09-121-6/+14
| | | | | | | | | | another encoding. 5.4 only as this implies a BC break.
| * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| |
| * - re apply the rng change specific to windows, long term it should be a std ↵Pierre Joye2011-07-191-0/+9
| | | | | | | | 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.
| * Revert change to use a special Windows version of openssl_random_pseudo_bytes().Scott MacVicar2011-07-191-9/+0
| | | | | | | | | | | | | | | | | | 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?
| * openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to ↵Scott MacVicar2011-07-191-6/+12
| | | | | | | | | | | | | | | | | | | | 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.
| * - use php_win32_get_random_bytes instead of over slow and partially wrong ↵Pierre Joye2011-07-101-0/+13
| | | | | | | | openssl's version
| * - did I not kill that already? (do not use rand_screen, pointless on server ↵Pierre Joye2011-06-161-4/+0
| | | | | | | | and not TS)
| * - Added new parameter parsing option (p - for valid path (string without ↵Felipe Pena2011-06-061-8/+8
| | | | | | | | | | | | | | | | null byte in the middle)) # The tests will be fixed in the next commits
| * Allow management of your own padding in openssl_encrypt/decrypt.Scott MacVicar2011-05-201-10/+19
| | | | | | | | | | | | For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
* | Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).Scott MacVicar2012-02-231-0/+4
| |
* | - Year++Felipe Pena2012-01-011-1/+1
| |
* | fix uninitialized var that may lead to crashStanislav Malyshev2011-12-261-1/+1
| |
* | Fix segfault in older versions of OpenSSL (before 0.9.8i)Scott MacVicar2011-12-181-1/+3
| |
* | Make sure that we set the strong crypto result to false as well as returning ↵Scott MacVicar2011-12-071-0/+6
| | | | | | | | false.
* | - Fixed bug #55646: textual data is returned in UTF-8, but is input inGustavo André dos Santos Lopes2011-09-121-6/+14
| | | | | | | | | | another encoding. 5.4 only as this implies a BC break.
* | - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| |
* | - re apply the rng change specific to windows, long term it should be a std ↵Pierre Joye2011-07-191-0/+9
| | | | | | | | 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.
* | Revert change to use a special Windows version of openssl_random_pseudo_bytes().Scott MacVicar2011-07-191-9/+0
| | | | | | | | | | | | | | | | | | 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?
* | openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to ↵Scott MacVicar2011-07-191-6/+12
| | | | | | | | | | | | | | | | | | | | 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.
* | - use php_win32_get_random_bytes instead of over slow and partially wrong ↵Pierre Joye2011-07-101-0/+9
| | | | | | | | openssl's version
* | - did I not kill that already? (do not use rand_screen, pointless on server ↵Pierre Joye2011-06-161-4/+0
| | | | | | | | and not TS)
* | - Added new parameter parsing option (p - for valid path (string without ↵Felipe Pena2011-06-061-8/+8
| | | | | | | | | | | | | | | | null byte in the middle)) # The tests will be fixed in the next commits
* | Allow management of your own padding in openssl_encrypt/decrypt.Scott MacVicar2011-05-201-10/+19
|/ | | | | | For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
* The project calls itself OpenSSL and not openSSL, so let's keep itMartin Jansen2011-04-251-2/+2
| | | | | that way in our code as well.
* SSLV2 patch cleanupRasmus Lerdorf2011-04-241-0/+4
|
* - fix bug #54061, memory leak in openssl_decryptPierre Joye2011-02-211-0/+1
|
* - fix bug #54060, memory leak in openssl_encryptPierre Joye2011-02-211-0/+1
|
* - Year++Felipe Pena2011-01-011-1/+1
|
* - not TS and useless on server, also not required anymore with the supported ↵Pierre Joye2010-12-021-4/+1
| | | | windows versions
* - Fixed bug #53136 (Invalid read on openssl_csr_new())Felipe Pena2010-11-121-1/+2
|
* Fix vim marker folds.Adam Harvey2010-10-131-1/+1
|
View Lorry Controller Status