summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Collapse)AuthorAgeFilesLines
* Sync leading and final newlines in source code filesPeter Kokot2018-10-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* Trim trailing whitespace in source code filesPeter Kokot2018-10-131-1/+1
|
* Merge branch 'PHP-7.2' into PHP-7.3Anatol Belski2018-09-131-1/+12
|\ | | | | | | | | * PHP-7.2: Backport changes for OpenSSL 1.1.1 CI integration
| * Backport changes for OpenSSL 1.1.1 CI integrationAnatol Belski2018-09-131-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add debug message for failing test parts (cherry picked from commit a45169a6ba54b13484d70cb474679c96347f779b) Show all unmatched errors when test failed (cherry picked from commit 70159652541c62b5f3bbb26da76b7e56987b2544) More possibly colliding libs to remove from the test image (cherry picked from commit 3008ad1a49210e4604522a987cbdd27a5a0a2c42) Remove colliding file from CI image (cherry picked from commit 6220d21c3420ff0d7366d410920ba5279fba3893) Fix typo (cherry picked from commit 24517d82cf8dc708d08bc77435ad418de4bdff4e)
* | Merge branch 'PHP-7.2' into PHP-7.3Anatol Belski2018-09-121-2/+2
|\ \ | |/ | | | | | | * PHP-7.2: Improve error code matching
| * Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-09-121-2/+2
| |\ | | | | | | | | | | | | * PHP-7.1: Improve error code matching
| | * Improve error code matchingAnatol Belski2018-09-121-2/+2
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2018-09-091-2/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-09-091-2/+6
| |\ \ | | |/
| | * Fix ssl stream reneg limit test to print only after first renegotiationJakub Zelenka2018-09-091-2/+6
| | | | | | | | | | | | | | | It has been reported that in some setup the test does multiple renegotiations which is allowed.
* | | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2018-09-021-1/+3
|\ \ \ | |/ /
| * | Fix stream_security_level.phpt with OpenSSL 1.1.1Jakub Zelenka2018-09-021-1/+3
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2018-08-193-2/+97
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-08-193-2/+97
| |\ \ | | |/
| | * Fix bug #76705 (unusable ssl => peer_fingerprint in stream_context_create())Jakub Zelenka2018-08-193-2/+97
| | |
* | | Trim trailing whitespaces in build filesPeter Kokot2018-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some editors utilizing .editorconfig automatically trim whitespaces. For convenience this patch removes whitespaces in certain build files: - ext/*/config*.m4 - configure.ac - acinclude.m4
* | | Remove unused Git attributes identPeter Kokot2018-07-256-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Use zval_ptr_dtor() instead of zval_dtor() in internal functions that ↵Dmitry Stogov2018-07-051-1/+1
| | | | | | | | | | | | destroy new created object (This is safer and produces less code)
* | | Fixed incorrrecr zval_dtor() usage to replace value of argument passed by ↵Dmitry Stogov2018-07-051-19/+19
| | | | | | | | | | | | reference, that may lead to memory leaks.
* | | Replace legacy zval_dtor() by zval_ptr_dtor_nogc() or even more specialized ↵Dmitry Stogov2018-07-041-3/+3
| | | | | | | | | | | | | | | | | | | | | destructors. zval_dtor() doesn't make a lot of sense in PHP-7.* and it's used incorrectly in some places. Its occurances should be replaced by zval_ptr_dtor() or zval_ptr_dtor_nogc(), or even more specialized destructors.
* | | Add ssl/tls streams options for min and max proto versionJakub Zelenka2018-07-013-66/+181
| | |
* | | Merge branch 'PHP-7.2'Jakub Zelenka2018-06-212-0/+5
|\ \ \ | |/ /
| * | Make new openssl ext tests in 7.2 consitentJakub Zelenka2018-06-212-0/+5
| | |
* | | Merge branch 'PHP-7.2'Jakub Zelenka2018-06-2188-707/+780
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-06-2188-708/+780
| |\ \ | | |/
| | * Use unix NL in all openssl ext testsJakub Zelenka2018-06-213-126/+126
| | |
| | * Make code in openssl ext tests more consistentJakub Zelenka2018-06-2188-629/+708
| | | | | | | | | | | | | | | Mainly use spaces for indent and fix some other CS issues. Also drop checks for unsupported OpenSSL library versions.
* | | Use zend_string_release_ex() instread of zend_string_release() in places, ↵Dmitry Stogov2018-05-282-25/+25
| | | | | | | | | | | | where we sure about string persistence.
* | | Merge branch 'PHP-7.2'Jakub Zelenka2018-05-223-13/+32
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-05-223-13/+32
| |\ \ | | |/
| | * Fix bug #76174 (openssl extension fails to build with LibreSSL 2.7)Jakub Zelenka2018-05-223-13/+32
| | |
* | | Merge branch 'PHP-7.2'Jakub Zelenka2018-05-182-3/+25
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-05-182-3/+25
| |\ \ | | |/
| | * Add test for bug #76296Jakub Zelenka2018-05-181-0/+22
| | |
| | * Fix bug #76296 (openssl_pkey_get_public does not respect open_basedir)Erik Lax2018-05-181-3/+3
| | |
* | | Fix keylen type mismatch in openssl_pkey_deriveJakub Zelenka2018-05-111-8/+10
| | |
* | | Fix openssl_pkey_derive arginfoJakub Zelenka2018-05-091-1/+1
| | |
* | | Add openssl_pkey_deriveJim Zubov2018-05-094-1/+126
| | |
* | | Merge branch 'PHP-7.2'Jakub Zelenka2018-04-151-5/+8
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-04-151-5/+8
| |\ \ | | |/
| | * Make openssl_error_string test work in OpenSSL 1.1.1Jakub Zelenka2018-04-151-5/+8
| | | | | | | | | | | | It was the only failing test
* | | Merge branch 'PHP-7.2'Christoph M. Becker2018-02-231-3/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix some arginfos
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-02-231-3/+5
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix some arginfos
| | * Fix some arginfosGabriel Caruso2018-02-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | * all arguments for ftp_pasv are required * $varname for getenv function isn't required anymore * fsockopen and pfsockopen only require $hostname * strtok can work with only one parameter * strpbrk needs two parameters to work * required parameters and add some parameters in openssl_* functions
* | | Use int instead of long in protosGabriel Caruso2018-02-231-7/+7
| | |
* | | Use EXPECT instead of EXPECTF when possibleGabriel Caruso2018-02-2025-25/+25
| | | | | | | | | | | | EXPECTF logic in run-tests.php is considerable, so let's avoid it.
* | | Merge branch 'PHP-7.2'Christoph M. Becker2018-02-201-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix openssl_* arginfos
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-02-201-3/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix openssl_* arginfos
| | * Fix openssl_* arginfosGabriel Caruso2018-02-201-3/+2
| | | | | | | | | | | | openssl_pkcs12_export and openssl_x509_parse had wrong arginfos
* | | Remove trailing whitespace in inc filesGabriel Caruso2018-02-101-1/+1
| | |