summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Added tls 1.3 support for PHPcodarrenvelvindron2019-04-284-5/+142
| | | |
| * | | Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function ↵Dmitry Stogov2019-04-241-17/+17
| | | | | | | | | | | | | | | | by reference
* | | | Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function ↵Dmitry Stogov2019-04-241-17/+17
|\ \ \ \ | | | | | | | | | | | | | | | by reference
| * | | | Use ZEND_TRA_ASSIGN_REF_... macros for by reference arguments of internal ↵Dmitry Stogov2019-04-241-17/+17
| |/ / / | | | | | | | | | | | | functions.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-04-201-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-7.4: Update changelogs Remove PHP_SETUP_KERBEROS m4 macro
| * | | Remove PHP_SETUP_KERBEROS m4 macroPeter Kokot2019-04-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | With recent transition to pkg-config/pkgconf this macro has been now a simple wrapper for PKG_CHECK_MODULES and PHP_EVAL_INCLINE so it's better to omit it altogether and use these two in the *.m4 code directly.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-04-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Use PKG_CHECK_MODULES to detect the kerberos libraries
| * | | Use PKG_CHECK_MODULES to detect the kerberos librariesHugh McMaster2019-04-201-1/+1
| | | |
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-04-151-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-04-151-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-04-151-1/+1
| | |\ \ | | | |/
| | | * Fix uninitialized cert_capturedNikita Popov2019-04-151-1/+1
| | | | | | | | | | | | | | | | This is a legimitimate bug and also shows up under valgrind.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-03-191-320/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Remove extension readmes
| * | | Remove extension readmesPeter Kokot2019-03-191-320/+0
| | | | | | | | | | | | | | | | | | | | This patch removes several extension readmes in favor of the PHP manual and where possible.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-03-1546-95/+95
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Replace dirname(__FILE__) by __DIR__ in tests
| * | | Replace dirname(__FILE__) by __DIR__ in testsFabien Villepinte2019-03-1546-95/+95
| | | |
* | | | Adjust tests for zpp TypeError changeNikita Popov2019-03-1116-157/+33
|/ / /
* | | Remove function_table var from the callerc9s2019-03-111-1/+1
| | | | | | | | | | | | | | | function_table var is not used in call_user_function macro anymore hence replace the usage with NULL
* | | Use EXPECT when possibleGabriel Caruso2019-03-113-3/+3
| | | | | | | | | | | | EXPECTF logic in run-tests.php is considerable, so let's avoid it.
* | | Merge branch 'PHP-7.3' into PHP-7.4Jakub Zelenka2019-03-106-5/+17
|\ \ \ | |/ /
| * | Speed up TLS wrapper test for min and max versionsJakub Zelenka2019-03-101-1/+1
| | |
| * | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-03-105-4/+16
| |\ \ | | |/
| | * Speed up TLS wrapper tests when SSLv3 disabledJakub Zelenka2019-03-105-4/+16
| | | | | | | | | | | | | | | If SSLv3 is disabled in OpenSSL, then sslv3 is not available so the accept times out. This commit removes the extra accept if SSLv3 is disabled.
* | | Add AS_HELP_STRING to *nix build configure optionsPeter Kokot2019-03-071-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | The Autoconf's default AS_HELP_STRING macro can properly format help strings [1] so watching out if columns are aligned manually is not anymore. [1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings
* | | Replace PHP_TM_GMTOFF with AC_CHECK_MEMBERSPeter Kokot2019-03-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - PHP_TM_GMTOFF removed - HAVE_TM_GMTOFF replaced with HAVE_STRUCT_TM_TM_GMTOFF - HAVE_TM_ZONE replaced with HAVE_STRUCT_TM_TM_ZONE - HAVE_TZNAME removed The PHP_TM_GMTOFF macro can be replaced with Autoconf's AC_CHECK_MEMBERS that defines the HAVE_STRUCT_TM_TM_GMTOFF symbol instead of the HAVE_TM_ZONE. The HAVE_TZNAME symbol is not used in current code. The obsolete HAVE_TM_ZONE symbol has been replaced with more proper HAVE_STRUCT_TM_TM_ZONE. These are defined by the AC_STRUCT_TIMEZONE macro.
* | | Merge branch 'PHP-7.3' into PHP-7.4Anatol Belski2019-02-281-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Sync with behavior change in OpenSSL 1.1.1b
| * | Merge branch 'PHP-7.2' into PHP-7.3Anatol Belski2019-02-281-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Sync with behavior change in OpenSSL 1.1.1b
| | * Sync with behavior change in OpenSSL 1.1.1bAnatol Belski2019-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | A behavior change in revealed by some openssl_decrypt() based test, where an encrypt API is used with a decrypt context. The EVP_Cipher* functions will automatically choose the right operation depending on the context passed.
* | | Merge branch 'PHP-7.3' into PHP-7.4Jakub Zelenka2019-02-241-86/+89
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-02-241-86/+89
| |\ \ | | |/
| | * Print empty string in test for but 77390 just onceJakub Zelenka2019-02-241-2/+5
| | |
| | * Use spaces instead of tabs in bug 77390 testJakub Zelenka2019-02-241-85/+85
| | |
* | | Revert "Disable bug77390.phpt"Jakub Zelenka2019-02-241-1/+0
| | | | | | | | | | | | This reverts commit 139492b1ae67efe541f88f8d1f3183e40ad7636d.
* | | Disable bug77390.phptNikita Popov2019-02-221-0/+1
| | | | | | | | | | | | This is causing a lot of spurious failures on AppVeyor.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-02-202-12/+35
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-202-12/+35
| |\ \ | | |/
| | * OpenSSL: Improve non-blocking eof testAbyr Valg2019-02-202-12/+35
| | |
* | | Implement fine-grained conflict handlingNikita Popov2019-02-201-0/+1
| | | | | | | | | | | | | | | | | | Tests can specify conflict keys, either in --CONFLICTS-- or a per-directory CONFLICTS file. Non-conflicting tests may be run in parallel.
* | | Added test for openssl_pkcs12_export_to_file_errorEnrico Zimuel2019-02-101-0/+37
| | |
* | | Fix incorrect outbuf freeingNikita Popov2019-02-081-8/+0
| | |
* | | Remove local variablesPeter Kokot2019-02-033-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
* | | Remove yearly range from copyright noticeZeev Suraski2019-01-303-3/+3
| | |
* | | Merge branch 'PHP-7.3'Jakub Zelenka2019-01-253-49/+184
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-01-253-49/+184
| |\ \ | | |/
| | * Fix bug #77390 (feof might hang on TLS streams in case of fragmented TLS ↵Jakub Zelenka2019-01-252-24/+21
| | | | | | | | | | | | | | | | | | records) Simplified version of the fix from Abyl Valg so credit to him.
| | * Update and integrate openssl client proxy testJakub Zelenka2019-01-253-150/+72
| | |
| | * Add a test for fragmented SSL packetsAbyr Valg2019-01-252-0/+216
| | |
* | | Refactor subset of openssl module.David Carlier2019-01-142-83/+161
| | | | | | | | | | | | | | | Proposal to abstract a subset of the openssl module, to be able to use two ways encryption outside of this context.
* | | Implement typed propertiesNikita Popov2019-01-111-59/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC: https://wiki.php.net/rfc/typed_properties_v2 This is a squash of PR #3734, which is a squash of PR #3313. Co-authored-by: Bob Weinand <bobwei9@hotmail.com> Co-authored-by: Joe Watkins <krakjoe@php.net> Co-authored-by: Dmitry Stogov <dmitry@zend.com>
* | | ext/openssl: port to pkg-config macro and consistently require its useEli Schwartz2019-01-111-1/+1
| | | | | | | | | | | | | | | | | | openssl 0.9.8 in July 2005 first added pkg-config support, which is earlier than the minimum supported version for php. This should therefore be uiversally supported.