summaryrefslogtreecommitdiff
path: root/ext/openssl/php_openssl.h
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused Git attributes identPeter Kokot2018-07-251-2/+0
| | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-05-221-0/+19
|\
| * Fix bug #76174 (openssl extension fails to build with LibreSSL 2.7)Jakub Zelenka2018-05-221-0/+19
| |
| * year++Xinchen Hui2018-01-021-1/+1
| |
| * Followup on 0ec147d3 for another placeAnatol Belski2017-07-241-0/+9
| | | | | | | | | | | | which requires also to move the macros into the header (cherry picked from commit b7eb2c060409a8f5809d6e73f53d88844cf9ed09)
* | year++Xinchen Hui2018-01-021-1/+1
| |
* | Followup on 0ec147d3 for another placeAnatol Belski2017-07-241-0/+9
| | | | | | | | which requires also to move the macros into the header
* | Merge branch 'PHP-7.1'Jakub Zelenka2017-06-251-0/+1
|\ \ | |/
| * Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key paddingJakub Zelenka2017-06-251-0/+1
| | | | | | | | | | | | It fixes bug #71917 (openssl_open() returns junk on envelope < 16 bytes) and bug #72362 (OpenSSL Blowfish encryption is incorrect for short keys).
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | Add openssl_pkcs7_read and output P7B in openssl_pkcs7_verifyJelle van der Waa2017-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | Add an optional argument to openssl_pkcs7_verify to save the P7B structure which can contain extra CA intermediate certificates send along with an S/MIME signed email. Introduce a new function called openssl_pkcs7_read, which can read a PKCS#7 structure passed as a string and returns by reference an array with PEM certificates formatted as a string.
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
|/
* Use opaque RSA, DSA and DHJakub Zelenka2016-07-171-6/+0
|
* Use opaque EVP_PKEY in php_openssl_is_private_keyJakub Zelenka2016-07-171-0/+3
|
* Wrap pkey id and rsa gettersJakub Zelenka2016-07-171-0/+4
|
* Use and fix storing errors in openssl_x509_export_to_fileJakub Zelenka2016-01-091-0/+1
| | | | Also use persistent memory to prevent segfualt
* Add initial almost empty php_openssl_store_errorsJakub Zelenka2016-01-081-0/+2
|
* Add global data for storing OpenSSL errorsJakub Zelenka2016-01-071-0/+19
|
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
* | Merge branch 'PHP-5.6'Tjerk Meesters2015-06-261-0/+2
|\ \ | |/ | | | | | | * PHP-5.6: Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
| * Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read ↵Tjerk Meesters2015-06-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with extra certs Squashed commit of the following: commit a64c1d9bc4c129fd946a478bdcb55101e42157b7 Author: Tomasz Sawicki <falundir@gmail.com> Date: Wed Jun 24 08:49:37 2015 +0200 Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs The "key values mismatch" error is triggered in openssl_pkcs12_read by PKCS12_parse, because it uses X509_check_private_key to separate main certificate (which corresponds to private key) from extra certificates. Extra certificates usually comes first (p12 contents are reversed as stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH error. The fix pops "key values mismatch" error from OpenSSL error stack for each extra certificate if there are any.
| * bump yearXinchen Hui2015-01-151-1/+1
| |
* | cleanup mod version macros, round 3Anatol Belski2015-03-231-0/+3
| |
* | bump yearXinchen Hui2015-01-151-1/+1
| |
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
|/
* Refactor + reorganize openssl filesDaniel Lowrey2014-03-051-2/+10
| | | | | | | | | - All streams-related code now lives in xp_ssl.c. Previously stream code was split across both openssl.c and xp_ssl.c - Folded superfluous php_openssl_structs.h into xp_ssl.c - Server-specific options now set on SSL_CTX instead of SSL - Deprecate SNI_server_name ctx option - Miscellaneous refactoring
* Mitigate client-initiated SSL renegotiation DoSDaniel Lowrey2014-02-211-0/+4
|
* Add openssl_get_cert_locations() functionDaniel Lowrey2014-02-201-0/+2
|
* Bump yearXinchen Hui2014-01-031-1/+1
|
* Renamed to be more descriptive of what it doesTjerk Meesters2013-09-231-1/+1
|
* added openssl_x509_digest(), output is binary sha1datibbaw2013-09-201-0/+1
|
* Address feature request #38917 for native SPKAC (HTML5 keygen element) supportjas-2013-05-061-0/+5
|
* Happy New YearXinchen Hui2013-01-011-1/+1
|
* Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar2012-06-111-1/+1
| | | | | Summary: Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
* Add PBKDF2 support via openssl()Scott MacVicar2012-06-111-0/+2
| | | | | | | | | | | | | | | 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
* - Year++Felipe Pena2012-01-011-1/+1
|
* Allow management of your own padding in openssl_encrypt/decrypt.Scott MacVicar2011-05-201-0/+3
| | | | | | For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
* - Year++Felipe Pena2011-01-011-1/+1
|
* sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.phpSebastian Bergmann2010-01-031-1/+1
|
* MFH: Bump copyright year, 3 of 3.Sebastian Bergmann2008-12-311-1/+1
|
* MFH: Bump copyright year, 2 of 2.Sebastian Bergmann2007-12-311-1/+1
|
* - implement #39867, PKCS#12 supportPierre Joye2007-04-041-0/+5
| | | | | | - Fix possible multibyte issues issue in the add_assoc function - add test for openssl_csr_get_subject
* MFH: Bump year.Sebastian Bergmann2007-01-011-1/+1
|
* - add openssl_csr_get_subject() and openssl_csr_get_public_key()Pierre Joye2006-08-151-1/+2
|
* - add OPENSSL_KEYTYPE_EC constantPierre Joye2006-08-151-0/+1
| | | | | - openssl_pkey_get_details(), returns the key details
* bump year and license versionfoobar2006-01-011-3/+3
|
* - Bumber up yearfoobar2005-08-031-1/+1
|
* - Happy new year and PHP 5 for rest of the files too..foobar2004-01-081-2/+2
| | | | | # Should the LICENSE and Zend/LICENSE dates be updated too?
* - HAVE_OPENSSL_EXT is not defined always.foobar2003-06-271-1/+1
|
View Lorry Controller Status