archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
110438 commits 526 branches 1434 tags 883 MiB
Commit graph

522 commits

Author SHA1 Message Date
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
Anatol Belski
1552d6ae7b disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows 
This is using the openssl binary which, despite it's contained in the
deps, would probably miss all it's environment. It is just prone to
failure and thus is not worth it.
 2014-11-28 12:24:32 +01:00
Dominic Luechinger
17e98661c6 Adds test cases for openssl EC improvements 2014-11-24 02:31:19 +01:00
Dominic Luechinger
437ab7f1f4 Minor fix: Missing quotes in openssl test case for bug bug64802 2014-11-23 15:15:49 -08:00
Tjerk Meesters
836a5dfddb Fixed bug #68234 
Certificate will now expire in 2034
 2014-10-15 21:12:13 +08:00
Ferenc Kovacs
d27f3e7b64 update the certificate used for the test, as it expired recently 2014-09-24 13:40:52 +02:00
Stanislav Malyshev
c41ca94824 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix missing type checks in various functions

Conflicts:
	ext/openssl/openssl.c
 2014-07-28 00:37:32 -07:00
Stanislav Malyshev
531be9662f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix missing type checks in various functions
 2014-07-28 00:34:27 -07:00
Stanislav Malyshev
b4a4db467b Fix missing type checks in various functions 2014-07-27 02:42:49 -07:00
Remi Collet
e9c9169e05 skip this test which fails without network 2014-06-20 06:45:16 +02:00
Remi Collet
fc36277eb6 Fix test on modern distro where old unsecure algo are disabled in openssl config. 
Testing recent algo should be enough to check this function.
 2014-06-16 09:42:55 +02:00
Stanislav Malyshev
3d9f922c03 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:19:50 -07:00
Stanislav Malyshev
4946dc1ab9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:19:16 -07:00
Paul Oehler
76a7fd893b Added support for parsing ssl certificates using GeneralizedTime format. 
fix bug #65698
fix bug #66636
 2014-06-08 14:17:58 -07:00
Remi Collet
89dc5924c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS
 2014-03-14 09:52:47 +01:00
Remi Collet
e1d8c0a051 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
 2014-03-14 09:52:02 +01:00
Remi Collet
17f6391bf8 Fixed Bug #66833 Default digest algo is still MD5 
Switch to SHA1, which match internal openssl hardcoded algo.

In most case, won't even be noticed
- priority on user input (default_md)
- fallback on system config
- fallback on this default value

Recent system reject MD5 digest, noticed in bug36732.phpt failure.

While SHA1 is better than MD5, SHA256 is recommenced,
and defined as default algo in provided configuration on
recent system (Fedora 21, RHEL-7, ...). But the idea is to
keep in sync with openssl internal value for PHP internal value.
 2014-03-14 09:50:15 +01:00