archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
122692 commits 526 branches 1434 tags 873 MiB
Commit graph

635 commits

Author SHA1 Message Date
Joe Watkins
f2367d4626
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:57 +01:00
Joe Watkins
14be7dcf8e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:29 +01:00
Fabien Villepinte
51ea2cfbe1
Fix bug #75307 Wrong reflection for openssl_open function 2017-10-27 16:06:01 +01:00
Jakub Zelenka
d5127cec6a Merge branch 'PHP-7.2' 2017-10-22 18:59:32 +01:00
Jakub Zelenka
e33721978e Merge branch 'PHP-7.1' into PHP-7.2 2017-10-22 18:58:15 +01:00
Jakub Zelenka
f10fd89f99 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-22 18:57:14 +01:00
Jakub Zelenka
34ed75fab7 Fix clean up for openssl_pkcs12_export_to_file_basic 2017-10-22 18:54:15 +01:00
Jelle van der Waa
314bef5d03 openssl: Fix openssl_pkcs12_export extracerts test 
Fix the openssl_pkcs12_export testcase for extracerts, the 'extracerts'
option needs to be the key of the certificate value otherwise
openssl_pkcs12_export will ignore it.
 2017-10-22 18:53:30 +01:00
Jelle van der Waa
8106688575 openssl: add basic openssl_get_cert_locations test 
Add a simple test for openssl_get_cert_locations, verifying the returned
array structure.
 2017-08-19 15:31:27 +02:00
Anatol Belski
cb7e42da25 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add test for bug #74903
 2017-07-24 17:03:24 +02:00
Anatol Belski
2dc81d4a09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add test for bug #74903
 2017-07-24 17:02:55 +02:00
Anatol Belski
a769d873f8 Add test for bug #74903 2017-07-24 17:02:10 +02:00
Joe Watkins
52964bbfb2
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  openssl: Add openssl_pkcs12_export_to_file tests
 2017-07-24 10:47:02 +01:00
Joe Watkins
5816ce330c
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  openssl: Add openssl_pkcs12_export_to_file tests
 2017-07-24 10:46:52 +01:00
Jelle van der Waa
23c124ec75
openssl: Add openssl_pkcs12_export_to_file tests 
Add basic tests for openssl_pkcs12_export_to_file.
 2017-07-24 10:46:42 +01:00
Jakub Zelenka
26982e36d5 Add support for OpenSSL security level 2017-07-17 17:40:51 +01:00
Jakub Zelenka
c08dba3431 Allow setting SNI cert and pk in separate files 2017-07-16 16:15:43 +01:00
Stanislav Malyshev
d75dbb0e31 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 21:23:16 -07:00
Stanislav Malyshev
0ba04f7737 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 21:18:10 -07:00
Stanislav Malyshev
73cabfedf5 Fix bug #74651 - check EVP_SealInit as it can return -1 2017-07-04 19:30:56 -07:00
Jakub Zelenka
e657f0d3f2 Merge branch 'PHP-7.1' 2017-06-25 18:11:10 +01:00
Jakub Zelenka
0c707fcb10 Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding 
It fixes bug #71917 (openssl_open() returns junk on envelope < 16 bytes)
and bug #72362 (OpenSSL Blowfish encryption is incorrect for short
keys).
 2017-06-25 18:08:50 +01:00
Anatol Belski
eb68301df1 Relax test condition, as OpenSSL 1.1.x out differs in EOL only 2017-06-24 00:25:51 +02:00
Anatol Belski
d7b9eb981a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
 2017-06-24 00:24:56 +02:00
Anatol Belski
b714309056 Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content 
The patch for bug #74720 was incomplete.
 2017-06-24 00:18:57 +02:00
Jelle van der Waa
787a18a50a Add openssl_pkcs7_read and output P7B in openssl_pkcs7_verify 
Add an optional argument to openssl_pkcs7_verify to save the P7B
structure which can contain extra CA intermediate certificates send
along with an S/MIME signed email.

Introduce a new function called openssl_pkcs7_read, which can read a
PKCS#7 structure passed as a string and returns by reference an array
with PEM certificates formatted as a string.
 2017-06-22 20:36:23 +01:00
Jakub Zelenka
fbb884e532 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-18 19:08:51 +01:00
Jelle van der Waa
509f5097ab openssl: Add openssl_pkcs12_(read, export) tests 
Add basic tests for openssl_pkcs12_read and openssl_pkcs12_export.
openssl_pkcs12_export has two tests disable which currently do not work
as intended and should be fixed.
 2017-06-18 19:02:51 +01:00
Jakub Zelenka
192b2d8391 Merge branch 'PHP-7.1' 2017-06-18 19:09:21 +01:00
Niklas Keller
bec91e1117 Use any TLS crypto method by default, don't use SSL 2017-06-10 17:31:24 -04:00
Anatol Belski
587b800811 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
 2017-06-09 17:37:42 +02:00
Anatol Belski
cbe73b3cfe Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in 
content
 2017-06-09 17:35:37 +02:00
Jelle van der Waa
f3d22e4999
openssl: Add basic openssl_pkcs7_verify tests 
Add basic openssl_pkcs7_verify tests, which verifies a signed email,
extracts the signed certificate and the body of the email.
 2017-06-01 08:12:25 +01:00
Anatol Belski
f8f8f24024 Merge branch 'PHP-7.1' 
* PHP-7.1:
  follow up fix on bug #74022
 2017-05-18 12:10:17 +02:00
Anatol Belski
26f217bf40 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  follow up fix on bug #74022
 2017-05-18 12:07:09 +02:00
Anatol Belski
464c1639ae follow up fix on bug #74022 2017-05-18 12:03:13 +02:00
Jakub Zelenka
dccf487b2d Merge branch 'PHP-7.1' 2017-04-30 19:47:23 +01:00
Jakub Zelenka
6028fe511e Fix bug #73808 (iv length warning too restrictive for aes-128-ccm) 2017-04-30 19:46:27 +01:00
Jakub Zelenka
2a6f0b8e61 Merge branch 'PHP-7.1' 2017-04-27 15:13:26 +01:00
Jakub Zelenka
d83d5f4198 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-27 15:11:52 +01:00
Jakub Zelenka
7b392c7154 Prefer using DIRECTORY_SEPARATOR in OpenSSL config path 2017-04-27 15:10:55 +01:00
Jakub Zelenka
e7166ea9be Add oid_section to the testing openssl.cnf 
It tests repeated OID addition
 2017-04-27 15:09:58 +01:00
Remi Collet
286ee99088 Merge branch 'PHP-7.1' 
* PHP-7.1:
  rely on bundle config, instead of system one
 2017-04-26 14:42:02 +02:00
Remi Collet
3f6d9fe9cc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  rely on bundle config, instead of system one
 2017-04-26 14:41:54 +02:00
Remi Collet
f639b64dca rely on bundle config, instead of system one 2017-04-26 14:41:40 +02:00
Remi Collet
7962185ded Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  skip the test on OpenSSL < 1.1 for now
 2017-04-26 14:39:14 +02:00
Anatol Belski
8cfaea656c skip the test on OpenSSL < 1.1 for now 2017-04-26 14:39:03 +02:00
Jakub Zelenka
2e727b9be1 Merge branch 'PHP-7.1' 2017-04-24 17:14:22 +01:00
Jakub Zelenka
7260f65c62 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-24 17:12:55 +01:00
Jakub Zelenka
9fa347997a Fix bug #73833 (null character not allowed in openssl_pkey_get_private) 2017-04-24 17:11:36 +01:00