php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
89,798 Commits 549 Branches 1,485 Tags
6551f996b90b69d29d7ad659c8d7cd4fa6e18b48
Commit Graph

849 Commits

Author SHA1 Message Date
Nikita Popov 2a87a42cd4 Dropped CN_match and SNI_server_name context options 2015-04-24 18:18:18 +02:00
Stanislav Malyshev cb9f58d046 Merge branch 'pull-request/1203' 
* pull-request/1203:
  Update openssl.c
 2015-04-18 19:32:14 -07: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
Daniel Lowrey 4f07330e79 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

Conflicts:
	ext/openssl/xp_ssl.c
 2015-04-14 09:27:37 -06:00
Daniel Lowrey 81f356b4ae Fix Bug #69402: Reading empty SSL stream hangs until timeout 2015-04-14 09:25:11 -06: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
Dmitry Stogov 5ba72e5f80 Fixed resource leak 2015-04-08 23:37:05 +03: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
Eric F 321bafccde Update openssl.c 
Adding additional checks for sslv3.
 2015-03-30 01:30:09 +02:00
Leigh 456f4a78d2 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:33:22 +01:00
Leigh a04ab4b54b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add RAND_egd check for compiling against LibreSSL
 2015-03-27 13:26:48 +01:00
Leigh 1b2d58a364 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:24:36 +01:00
Anatol Belski 19360f386e cleanup mod version macros, round 3 2015-03-23 20:54:55 +01:00
Dmitry Stogov 8633685675 Use specialized macro for string zval creation 2015-03-12 16:53:51 +03:00
Daniel Lowrey 589374d027 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Don't block on crypto data inside stream_select()
 2015-03-11 09:45:28 -06:00
Daniel Lowrey c661121459 Don't block on crypto data inside stream_select() 2015-03-11 09:44:07 -06: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 2dec21634c Revert "Add stream_socket_crypto_info() function" 
This reverts commit 13acb7ec65.

With the added capability to negotiate application layer protocols
via the TLS ALPN extension userland needs a method to access the
negotiated protocol on a given stream. The reverted commit added
a new stream_socket_crypto_info() function for this purpose.

This original approach was discarded in favor of using the
already-existing stream_get_meta_data() API which specifically
exists for just such purposes and requires the addition of no new
functions.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey 676a5059b2 Add crypto info to stream_get_meta_data() result on encrypted streams 
A "crypto" key is added to the output of stream_get_meta_data() calls
when invoked using a stream on which crypto is currently active. The
new key's associated array contains the following keys:

 - protocol (string e.g. TLSv1.2, TLSv1.1, etc)
 - cipher_name (string)
 - cipher_bits (int)
 - cipher_version (string)

If the TLS ALPN extension was used to successfully negotiate an
application protocol that protocol's identifier is stored in the
following key:

 - alpn_protocol

If no ALPN protocol was negotiated the "alpn_protocol" key is not
present in the crypto meta data array. More meta information
concerning the stream's active encryption state may be added in the
future.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey 748433e7bc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix crypto stream timeout regressions

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-09 16:02:04 -06:00
Daniel Lowrey 69691cc8ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix crypto stream timeout regressions
 2015-03-09 15:55:33 -06:00
Daniel Lowrey bbfd4a5e62 Fix crypto stream timeout regressions 2015-03-09 15:53:26 -06:00
Daniel Lowrey 00c35cb6a5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)

Conflicts:
	ext/openssl/openssl.c
 2015-03-06 11:31:04 -07:00
Daniel Lowrey 0928bad9ac Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly) 2015-03-06 11:29:56 -07:00
Anatol Belski be7371f9ff fix data type 2015-03-06 16:49:08 +01: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 88cfc6ccb6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	main/streams/streams.c
 2015-03-05 17:53:04 -07:00
Chris Wright e7df9d710c Fix stream_select() issue with OpenSSL buffer 
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-05 17:18:14 -07:00
Daniel Lowrey ca24d19a89 Really fix zts this time 2015-03-05 14:09:25 -07:00
Daniel Lowrey 927b137c1b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix ZTS
  Fix ZTS build

Conflicts:
	ext/openssl/openssl.c
	ext/openssl/xp_ssl.c
 2015-03-05 12:24:04 -07:00
Daniel Lowrey c985ec737d Fix ZTS 2015-03-05 12:19:15 -07:00
Daniel Lowrey 010f17534f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix ZTS build
 2015-03-05 12:13:33 -07:00
Daniel Lowrey e892f5382f Fix ZTS build 2015-03-05 12:12:55 -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 fe29b8134c Merge branch 'PHP-5.6' 
* PHP-5.6:
  hexadecimal is case*in*sensitive

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-04 23:00:59 -07:00
Daniel Lowrey 1de1ff75f5 Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6 
* 'PHP-5.6' of https://github.com/bjori/php-src:
  hexadecimal is case*in*sensitive
 2015-03-04 22:55:22 -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
Hannes Magnusson 3c2c029bfd hexadecimal is case*in*sensitive 2015-03-04 16:03:45 -08: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