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
26982e36d5
Add support for OpenSSL security level
2017-07-17 17:40:51 +01:00
90ae2aec8c
Make functions in openssl.c more consistent
...
Improve naming, CS and add some static defs
2017-07-16 18:38:17 +01:00
5381ff757d
Make consitent naming and improve CS in xp_ssl
2017-07-16 17:57:43 +01:00
c08dba3431
Allow setting SNI cert and pk in separate files
2017-07-16 16:15:43 +01:00
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
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
73cabfedf5
Fix bug #74651 - check EVP_SealInit as it can return -1
2017-07-04 19:30:56 -07:00
e657f0d3f2
Merge branch 'PHP-7.1'
2017-06-25 18:11:10 +01:00
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
eb68301df1
Relax test condition, as OpenSSL 1.1.x out differs in EOL only
2017-06-24 00:25:51 +02:00
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
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
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
9badf35386
Default single_dh_use and honor_cipher_order to true
2017-06-18 19:54:45 -04:00
fbb884e532
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-18 19:08:51 +01:00
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
192b2d8391
Merge branch 'PHP-7.1'
2017-06-18 19:09:21 +01:00
9dada7b291
Merge branch 'PHP-7.1'
2017-06-16 17:15:11 +01:00
c2a348b5bc
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-16 17:14:23 +01:00
f19dfac830
openssl: Fix spkstr and spki leak in openssl_spki_new
...
spkstr is not free'd when running the test and valgrind reports a leak
of 32,318 bytes. The free condition is not met since keyresource is not
NULL, apart from that OPENSSL_free actually free's the allocated memory
by OPENSSL_malloc inside OpenSSL.
Valgrind reports 768 bytes leaked in openssl_spki_new when running the
testsuite. Remove the keyresource check to always free spki.
2017-06-16 16:51:50 +01:00
bec91e1117
Use any TLS crypto method by default, don't use SSL
2017-06-10 17:31:24 -04:00
b50fe893a7
Merge branch 'PHP-7.1'
2017-06-09 23:48:25 +02:00
0fa40b0546
group the change for bug #74720
2017-06-09 23:47:15 +02:00
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
cbe73b3cfe
Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
...
content
2017-06-09 17:35:37 +02:00
8baf12b161
Merge branch 'PHP-7.1'
2017-06-04 18:22:02 +01:00
ff93f74f63
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-04 18:11:49 +01:00
3704947696
Replace ASN1_STRING_data with ASN1_STRING_get0_data
...
This is a slightly modified version of the patch from Jelle van der Waa
( @jelly ) so full credit to him.
2017-06-04 18:08:51 +01:00
c28406f611
Merge branch 'PHP-7.1'
2017-06-02 23:53:00 +02:00
c742abb3ce
openssl_pkcs12_read: add missing BIO_free
...
When filling the extracerts array with certificates bio_out is created
but not free'd leading to a small memory leak of 224 bytes (reported by
valgrind).
2017-06-02 23:52:43 +02:00
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
f8f8f24024
Merge branch 'PHP-7.1'
...
* PHP-7.1:
follow up fix on bug #74022
2017-05-18 12:10:17 +02:00
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
464c1639ae
follow up fix on bug #74022
2017-05-18 12:03:13 +02:00
dccf487b2d
Merge branch 'PHP-7.1'
2017-04-30 19:47:23 +01:00
6028fe511e
Fix bug #73808 (iv length warning too restrictive for aes-128-ccm)
2017-04-30 19:46:27 +01:00
a0b9554f94
Fix possible memory leak in openssl_encrypt and openssl_decrypt
2017-04-27 15:44:26 +01:00
2a6f0b8e61
Merge branch 'PHP-7.1'
2017-04-27 15:13:26 +01:00
d83d5f4198
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-27 15:11:52 +01:00
7b392c7154
Prefer using DIRECTORY_SEPARATOR in OpenSSL config path
2017-04-27 15:10:55 +01:00
e7166ea9be
Add oid_section to the testing openssl.cnf
...
It tests repeated OID addition
2017-04-27 15:09:58 +01:00
c0203c0ceb
Do not add already added object to the internal OpenSSL table
...
This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.
2017-04-26 14:59:15 +01:00
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
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
f639b64dca
rely on bundle config, instead of system one
2017-04-26 14:41:40 +02:00
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
8cfaea656c
skip the test on OpenSSL < 1.1 for now
2017-04-26 14:39:03 +02:00
2e727b9be1
Merge branch 'PHP-7.1'
2017-04-24 17:14:22 +01:00
7260f65c62
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-24 17:12:55 +01:00
Jelle van der Waa