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
Jakub Zelenka
488324e315
Merge branch 'PHP-7.1'
2017-04-23 20:33:48 +01:00
Jakub Zelenka
ba83b18ce3
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-23 20:31:24 +01:00
Jakub Zelenka
366b1640d0
Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key)
2017-04-23 20:30:14 +01:00
Xinchen Hui
6bd8ed4dde
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Update NEWS
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 19:03:38 +08:00
Xinchen Hui
3431132f18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 19:03:09 +08:00
Xinchen Hui
42e576ace2
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 19:02:50 +08:00
Jakub Zelenka
cdc33251d2
Add OpenSSL 1.1.0 support to PHP 7.0
2017-04-07 19:21:33 +01:00
Anatol Belski
c3e7a2a461
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Revert "extend skip section"
2017-04-04 16:25:10 +02:00
Anatol Belski
adc49b1d18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "extend skip section"
2017-04-04 16:23:49 +02:00
Anatol Belski
4ca3468e78
Revert "extend skip section"
...
This reverts commit 5136048064
2017-04-04 16:21:23 +02:00
Nikita Popov
8aa419c91c
Merge branch 'PHP-7.1'
2017-04-02 01:08:42 +02:00
Nikita Popov
32dcc1eef0
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-02 01:08:24 +02:00
Moritz Fain
46d286574b
Fixed bug #74341
...
Added support for ASN.1 UTCTime without seconds part (being 11 characters
long instead of 13).
Additionally, fixed incorrect handling of DST on systems without gmtoff.
2017-04-02 01:04:32 +02:00
Anatol Belski
a7f2dbf831
skip the test on OpenSSL < 1.1 for now
2017-03-23 03:10:27 +01:00
Anatol Belski
9ecd344cd4
Revert "fix wrong version check"
...
This reverts commit 307a4a2315
2017-03-22 17:42:44 +01:00
Anatol Belski
307a4a2315
fix wrong version check
2017-03-22 15:54:28 +01:00
Jakub Zelenka
6574d9fb3a
Merge branch 'PHP-7.1'
2017-03-20 16:09:26 +00:00
Jakub Zelenka
7dd52cbcdd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-20 16:08:16 +00:00
Jakub Zelenka
6d066dc421
Lower timeout in test for but #72333
2017-03-20 16:07:12 +00:00
Jakub Zelenka
bf9ddc7c13
Merge branch 'PHP-7.1'
2017-03-17 19:09:06 +00:00
Jakub Zelenka
ebc75dab50
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 19:08:26 +00:00
Jakub Zelenka
df135ffa7a
Make test 002 for bug #65538 not to use https in cafile
2017-03-17 19:07:32 +00:00
Jakub Zelenka
40d04784bb
Merge branch 'PHP-7.1'
2017-03-17 18:13:05 +00:00
Jakub Zelenka
b0ba8c68cd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 18:12:37 +00:00
