php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
93,281 Commits 549 Branches 1,485 Tags
83947f4282f614f6341b7fc32d09cf05abcf696a
Commit Graph

238 Commits

Author SHA1 Message Date
Jakub Zelenka 570cdc05d7 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-09 18:23:29 +00:00
Jakub Zelenka 1a12403002 Remove SNI test that trigger request to sni.velox.ch 
This has been requested by Kaspar Brand who provides
sni.velox.ch. That site is only for interactive
testing and not for unit/integration/regression testing.
Although this test is run only in special cases (when
SNI_TESTS is defined) it should still be removed.

Also this test is not reliable as it depends on external
resources.
 2015-11-09 18:11:18 +00:00
Jakub Zelenka e62db72111 Use standard title for new openssl tests 2015-10-29 19:11:57 +00:00
root 06c6b51e7d new tests to openssl module, don't covered yet. 2015-10-29 19:06:40 +00:00
Jakub Zelenka 41de89f61b Merge branch 'PHP-5.6' into PHP-7.0 2015-10-29 19:14:25 +00:00
marcosptf dae3ab8e7a Update openssl_x509_checkpurpose.phpt 2015-09-29 10:41:24 +02:00
root fc3580c9d5 add test to openssl ext 2015-09-29 10:41:22 +02:00
Anatol Belski 257693614e add test 2015-09-23 19:48:38 +02:00
Anatol Belski aba42e3dda use bundled openssl.cnf 2015-09-23 17:14:59 +02:00
Anatol Belski 77b9acd326 add test 2015-09-23 14:17:04 +02:00
Jakub Zelenka e235cb65fb Fix request #70438: Add IV parameter for openssl_seal and openssl_open 2015-09-06 19:09:56 +01:00
Jakub Zelenka 473ccf47a5 Merge branch 'PHP-5.6' 2015-09-06 16:42:37 +01:00
Jakub Zelenka d47029167d Fix bug #60632: openssl_seal fails with AES 2015-09-06 16:39:59 +01:00
Christoph M. Becker 28e82cc714 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70395: Missing ARG_INFO for openssl_seal()
 2015-09-05 03:19:43 +02:00
Christoph M. Becker 43b26c7b21 Fix #70395: Missing ARG_INFO for openssl_seal() 
This patch adds the missing ARG_INFO for the optional 5th parameter $method.
 2015-09-05 03:08:02 +02:00
Jakub Zelenka 6b9f31ab74 Merge branch 'PHP-5.6' 2015-08-27 20:17:33 +01:00
Jakub Zelenka c39336d1d8 Fix bug #55259 (openssl extension does not get the DH parameters from DH key resource) 2015-08-25 20:26:11 +01:00
Anatol Belski 78b2b1d6f7 fix test 
backport from master
 2015-08-23 17:27:55 +02:00
Tjerk Meesters 03a670eaaa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
 2015-06-26 06:03:29 +08:00
Tjerk Meesters 2ff3dafccf Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs 
Squashed commit of the following:

commit a64c1d9bc4
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.
 2015-06-26 05:33:28 +08:00
Nikita Popov 8a83aed458 Drop duplicate object-to-type notices 
We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.
 2015-06-22 16:25:32 +02:00
Rasmus Lerdorf 741382d968 Remove SSLv3 test dependencies 
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.

Conflicts:
	ext/openssl/tests/session_meta_capture.phpt
 2015-05-05 10:40:55 +02:00
Remi Collet 9340c5b347 Merge branch 'PHP-5.6' 
* PHP-5.6:
  skip test when xml not available
 2015-04-17 15:21:03 +02:00
Remi Collet 342acbe1c6 skip test when xml not available 2015-04-17 15:20:22 +02:00
Kalle Sommer Nielsen 156ac232cb Fix test for systems where openssl's time_t have an offset set 2015-04-09 19:57:44 +02:00
Kalle Sommer Nielsen 8d3c4e5988 Fix test on systems where EOL isn't "\n", like Windows 2015-04-08 23:56:29 +02:00
Rasmus Lerdorf 32484e3f5f Remove SSLv3 test dependencies 
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.
 2015-04-08 09:55:55 -07:00
Daniel Lowrey 4a336f5d0b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug# 69215 (Crypto servers should send client CA list)

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-10 18:18:19 -06:00
Daniel Lowrey 3f6b12795c Fix bug# 69215 (Crypto servers should send client CA list) 2015-03-10 18:13:10 -06:00
Daniel Lowrey c5c4d22c10 Deprecate "session_meta_capture" SSL context option 
Meta data about encrypted streams is now available as part of the
"crypto" key in the array returned by stream_get_meta_data(). This
update deprecates the use of the "session_meta_capture" ssl
context option in encrypted streams.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey eef261f0e4 Update test to run locally instead of remotely 2015-03-05 22:01:15 -07:00
Daniel Lowrey e82878a200 Update test to run locally instead of remotely 2015-03-05 22:00:38 -07:00
Daniel Lowrey c34ee4b146 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
	ext/openssl/openssl.c
 2015-03-05 10:27:11 -07:00
Daniel Lowrey 5939de35a8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
	configure.in
	main/php_version.h
 2015-03-05 10:21:32 -07:00
Daniel Lowrey 94140afa69 Fix bug #67403 (Add signatureType to openssl_x509_parse) 2015-03-05 10:09:06 -07:00
Daniel Lowrey 73de105481 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68265 (SAN match fails with trailing DNS dot)
 2015-03-04 23:56:36 -07:00
Daniel Lowrey 65a9a5ca12 Fixed bug #68265 (SAN match fails with trailing DNS dot) 2015-03-04 23:55:42 -07:00
Daniel Lowrey 94a70b98a6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68879 (IP Address fields in subjectAltNames not used)
  Fix broken test

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-04 22:42:25 -07:00
Daniel Lowrey 5dcace058a Fixed bug #68879 (IP Address fields in subjectAltNames not used) 2015-03-04 22:39:25 -07:00
Daniel Lowrey ca766e0787 Fix broken test 2015-03-04 22:37:07 -07:00
Daniel Lowrey b5d97140c0 Merge branch 'tls-alpn' 
* tls-alpn:
  Improve test to target specific issue
  Misc updates/cleanup
  Add TLS ALPN extension support in crypto client/server streams
  Add stream_socket_crypto_info() function
  Update for compatibility with newer openssl libs
 2015-03-04 13:56:58 -07:00
Daniel Lowrey 5de64a29e6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68920 (use strict peer_fingerprint input checks)

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-04 12:50:35 -07:00
Daniel Lowrey 241f3c34b8 Fixed bug #68920 (use strict peer_fingerprint input checks) 2015-03-04 12:47:46 -07:00
Daniel Lowrey 8680fc8331 Improve test to target specific issue 2015-03-04 10:23:46 -05:00
Xinchen Hui 10fe317300 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/openssl.c
 2015-02-16 14:18:08 +08:00
Xinchen Hui 8309988111 Fixed bug #68912 (Segmentation fault at openssl_spki_new) 2015-02-16 14:16:52 +08:00
Andrea Faulds e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Stanislav Malyshev 25e3e78016 Merge branch 'pull-request/916' 
* pull-request/916:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
 2014-11-30 18:27:37 -08:00
Stanislav Malyshev 8c08124c0e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
 2014-11-30 18:24:23 -08:00
Dominic Luechinger 6048ac32b4 Adds test cases for openssl EC improvements 2014-11-30 18:17:48 -08:00