summaryrefslogtreecommitdiff
path: root/ext/openssl/openssl.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix request #70438: Add IV parameter for openssl_seal and openssl_openJakub Zelenka2015-09-061-30/+45
|
* Merge branch 'PHP-5.6'Jakub Zelenka2015-09-061-0/+4
|\
| * Fix bug #60632: openssl_seal fails with AESJakub Zelenka2015-09-061-0/+4
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-09-051-1/+2
|\ \ | |/ | | | | | | * PHP-5.6: Fix #70395: Missing ARG_INFO for openssl_seal()
| * Fix #70395: Missing ARG_INFO for openssl_seal()Christoph M. Becker2015-09-051-1/+2
| | | | | | | | This patch adds the missing ARG_INFO for the optional 5th parameter $method.
* | Merge branch 'PHP-5.6'Jakub Zelenka2015-08-271-8/+5
|\ \ | |/
| * Fix bug #55259 (openssl extension does not get the DH parameters from DH key ↵Jakub Zelenka2015-08-251-7/+4
| | | | | | | | resource)
* | Use new range checks in openssl extJakub Zelenka2015-08-261-25/+34
| |
* | Add overflow check for openssl_pkcs12_readJakub Zelenka2015-08-201-0/+2
| |
* | Add overflow checks for openssl_pkey_* functionsJakub Zelenka2015-08-191-0/+4
| |
* | Move overflow checks in openssl_pbkdf2Jakub Zelenka2015-08-191-5/+5
| |
* | Use macros for openssl overflow checksJakub Zelenka2015-08-181-63/+40
| | | | | | | | It reduces code duplications
* | Fix possible overflow in openssl_pbkdf2Jakub Zelenka2015-08-181-0/+16
| | | | | | | | | | Especially key_length would lead to the crash if it overflowed to the negative value.
* | Check and use correct signature_len type for EVP_VerifyFinalJakub Zelenka2015-08-171-1/+5
| |
* | Fix some int overflows in opensslJakub Zelenka2015-08-161-1/+17
| | | | | | | | | | There might be more. I just did a quick check for enc/dec, rand and one BN call.
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-08-041-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: Zend/zend_exceptions.c ext/date/php_date.c ext/openssl/openssl.c ext/phar/phar_internal.h ext/soap/php_http.c ext/spl/spl_array.c ext/spl/spl_dllist.c ext/spl/spl_observer.c ext/standard/tests/serialize/bug69152.phpt sapi/cli/tests/005.phpt
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-08-041-4/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: ext/soap/php_http.c ext/spl/spl_observer.c
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-041-4/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: .gitignore ext/date/php_date.c ext/spl/spl_array.c ext/spl/spl_observer.c
| | | * Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytesStanislav Malyshev2015-07-261-4/+2
| | | |
| * | | fix backport mistakeAnatol Belski2015-07-031-1/+1
| | | | | | | | | | | | | | | | in 5.6 it has to be explicitly copied to avoid double free
| * | | backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6Anatol Belski2015-07-031-3/+8
| | | |
* | | | fix improper behaviorAnatol Belski2015-07-031-3/+8
| | | | | | | | | | | | | | | | | | | | openssl_spki_export() is documented to return string, but it's obviously not achieved writing it to stdout :)
* | | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-48/+48
| | | | | | | | | | | | | | | | semantick changes).
* | | | Merge branch 'PHP-5.6'Tjerk Meesters2015-06-261-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 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-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge branch 'PHP-5.5' into PHP-5.6Leigh2015-03-271-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Add RAND_egd check for compiling against LibreSSL
| | * | Add RAND_egd check for compiling against LibreSSLLeigh2015-03-271-0/+2
| | | |
* | | | Make convert_to_* safe with rc>1Nikita Popov2015-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only involves switching zval_dtor to zval_ptr_dtor for arrays and making the convert_to_object for arrays a bit more generic. All the other changes outside zend_operators.c just make use of this new ability (use COPY instead of DUP). What's still missing: Proper references handling. I've seen many convert_to* calls that will break when a reference is used. Also fixes bug #69788.
* | | | Corrected line comment 5256Radu Brănișcan2015-05-231-1/+1
| | | | | | | | | | | | | | | | From the text "dectupt" to "decrypt"
* | | | fix _timezone usage for vc14Anatol Belski2015-05-101-1/+1
| | | |
* | | | Update openssl.cEric F2015-03-301-0/+4
| | | | | | | | | | | | | | | | Adding additional checks for sslv3.
* | | | Add RAND_egd check for compiling against LibreSSLLeigh2015-03-271-0/+2
| | | |
* | | | cleanup mod version macros, round 3Anatol Belski2015-03-231-1/+1
| | | |
* | | | Use specialized macro for string zval creationDmitry Stogov2015-03-121-1/+1
| | | |
* | | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-061-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly) Conflicts: ext/openssl/openssl.c
| * | | Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)Daniel Lowrey2015-03-061-1/+1
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-03-051-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fix ZTS build
| | * | Fix ZTS buildDaniel Lowrey2015-03-051-1/+1
| | | |
* | | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #67403 (Add signatureType to openssl_x509_parse) 5.5.24 now Conflicts: ext/openssl/openssl.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-03-051-6/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix bug #67403 (Add signatureType to openssl_x509_parse) 5.5.24 now Conflicts: configure.in main/php_version.h
| | * | Fix bug #67403 (Add signatureType to openssl_x509_parse)Daniel Lowrey2015-03-051-6/+7
| | | |
| | * | Bump yearXinchen Hui2015-01-151-1/+1
| | | |
| | * | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2015-01-141-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * PHP-5.4: Update NEWS Fixed bug #55618 (use case-insensitive cert name matching)
| | | * Fixed bug #55618 (use case-insensitive cert name matching)Daniel Lowrey2015-01-141-2/+2
| | | |
* | | | Misc updates/cleanupDaniel Lowrey2015-03-041-2/+2
| | | |
* | | | Update for OpenSSL 1.0.2 compatibilityDaniel Lowrey2015-02-281-15/+47
| | | |
* | | | Remove unnecessary resource checks in openssl extJakub Zelenka2015-02-171-8/+11
| | | | | | | | | | | | | | | | | | | | The resource val is already checking Z_TYPE_P(val) == IS_RESOURCE. There is no need to call extended resource fetch functions though.
* | | | Merge branch 'PHP-5.6'Xinchen Hui2015-02-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: ext/openssl/openssl.c
| * | | Fixed bug #68912 (Segmentation fault at openssl_spki_new)Xinchen Hui2015-02-161-1/+1
| | | |
| * | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
View Lorry Controller Status