1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Commit Graph

1129 Commits

Author SHA1 Message Date
Anatol Belski bf14ecc0d8 use the new API for opaque symbol in OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Anatol Belski df1e1fdcb9 implement basic config support for OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Joe Watkins 5ae45ef993 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix memleaks from #1755 and some pre-existing ones
2017-01-07 10:15:15 +00:00
Leigh 21f287915c Remove superfluous variable reinit 2017-01-07 09:43:05 +00:00
Leigh 62e9e1fecd Some commentary, change free method 2017-01-06 15:49:15 +00:00
Leigh 9a0dac124e Conditionally free depending on how assignment happened 2017-01-06 15:24:37 +00:00
Leigh 053b966134 Fix memleaks from #1755 and some pre-existing ones 2017-01-06 14:58:54 +00:00
Joe Watkins 2d42423953 Merge branch 'pull-request/1755'
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
2017-01-06 07:43:59 +00:00
Joe Watkins 0884cffb67 Merge branch 'pull-request/1755'
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
2017-01-06 07:42:57 +00:00
Sammy Kaye Powers dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers 478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Nikita Popov 2497ae031b Don't check for precise length in ecc.phpt
Again, this can be off by one.
2016-12-29 22:05:38 +01:00
Nikita Popov 7746ed9d5f Merge branch 'PHP-7.0' into PHP-7.1 2016-12-29 21:00:14 +01:00
Nikita Popov 78675ebd9a Fix flaky openssl_pkey_new test
Public key size may vary by one bit... switch to using %d for
key sizes.
2016-12-29 20:59:28 +01:00
Bob Weinand 7b133e074c Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 23:34:51 +01:00
Bob Weinand ac1372d811 Fix alpn_ctx leaking in openssl 2016-12-22 23:34:07 +01:00
Anatol Belski 382ec5cf9e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  extend skip section
2016-12-14 19:56:19 +01:00
Anatol Belski 5136048064 extend skip section
The day light offset is calculated based on the system TZ, so with
an unsuitable one there's no way to workaround the false positives.
2016-12-14 19:53:55 +01:00
Anatol Belski 69c3859368 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix ident
2016-12-04 20:59:56 +01:00
Anatol Belski 69fbc751ff fix ident 2016-12-04 20:59:12 +01:00
Anatol Belski dfd776b326 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  enforce the test ini usage for the child process
2016-12-04 14:02:37 +01:00
Anatol Belski 10a2ceef3b enforce the test ini usage for the child process 2016-12-04 14:01:40 +01:00
Jakub Zelenka 0ebdf3625e Do not add extra timeval entropy when OpenSSL 1.1 used
It is already added by OpenSSL so it is not needed
2016-11-27 19:00:05 +00:00
Jakub Zelenka 0f4216298f Clean up and fix php_openssl_dh_pub_from_priv 2016-11-27 18:54:28 +00:00
Matteo Beccati 461add8adf Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix occasionaly failing test
2016-11-27 10:20:50 +01:00
Matteo Beccati 54c04befc2 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix occasionaly failing test
2016-11-27 10:20:38 +01:00
Matteo Beccati 2a80758fd5 Fix occasionaly failing test 2016-11-27 10:20:13 +01:00
Jakub Zelenka ce4869f038 Fix bug #73478 (openssl_pkey_new() generates wrong pub/priv keys with Diffie Hellman) 2016-11-20 20:06:39 +00:00
Anatol Belski c7d0571ef4 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix test portability
2016-11-18 22:11:25 +01:00
Anatol Belski 48191010d5 fix test portability 2016-11-18 22:10:41 +01:00
Jakub Zelenka 493b2bff02 Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2) 2016-11-06 20:40:51 +00:00
Jakub Zelenka e840071b76 Never return private part of the key from openssl_csr_get_public_key
This fixes ecc.phpt test when OpenSSL 1.1 linked.
2016-11-06 17:37:06 +00:00
Jakub Zelenka 1a13809bae Define X509_get_signature_nid for LibreSSL
It should hopefully fix the LibreSSL build. Thanks to Alice Wonder!
2016-10-30 19:12:24 +00:00
Jakub Zelenka 72659f9597 Fix EC_KEY memory leaks
It was caused by using of EVP_PKEY_get1_EC_KEY which increments an EC_KEY
reference. The fix it we simply use EVP_PKEY_get0_EC_KEY.
2016-10-30 18:58:11 +00:00
Jakub Zelenka 820bca8ca3 Try to fix LibreSSL build 2016-10-23 19:55:22 +01:00
Jakub Zelenka 930ae4034e Drop useless checks for DH and RSA
If DH or RSA was disabled, the build would fail already as
it's used already elsewhere without checking the OPENSSL_NO_DH
or OPENSSL_NO_RSA defines.
2016-10-23 19:37:07 +01:00
Joe Watkins d6fb5a1f1e Merge branch 'pull-request/1814' 2016-10-17 17:02:13 +01:00
Joe Watkins 522e4f1174 Merge branch 'pull-request/1814' 2016-10-17 17:01:10 +01:00
Anatol Belski 20b63996c0 fix test
(cherry picked from commit 57354e0313)
2016-10-14 02:01:53 +02:00
Stanislav Malyshev 177e6adca7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl

(cherry picked from commit ff75665663)
2016-10-14 01:58:48 +02:00
Anatol Belski 7897e8cd6c followup with #73276 merge
(cherry picked from commit b135ba3fa9)
2016-10-14 01:43:02 +02:00
Stanislav Malyshev fe789b3f7c Fix bug #73276 - crash in openssl_random_pseudo_bytes function
(cherry picked from commit 85a22a0af0)
(cherry picked from commit 7dc8b5e7ae)
2016-10-14 01:42:19 +02:00
Stanislav Malyshev cd8c9b0614 Fix outlen for openssl function
Even though datalen can't be over int, outlen can.
2016-10-12 23:19:07 -07:00
Anatol Belski b135ba3fa9 followup with #73276 merge 2016-10-12 16:03:35 +02:00
Stanislav Malyshev 7dc8b5e7ae Fix bug #73276 - crash in openssl_random_pseudo_bytes function
(cherry picked from commit 85a22a0af0)
2016-10-12 15:55:42 +02:00
Stanislav Malyshev 85a22a0af0 Fix bug #73276 - crash in openssl_random_pseudo_bytes function 2016-10-11 13:37:47 -07:00
Stanislav Malyshev 8822f7c9f0 fix bug #73275 - crash in openssl_encrypt function 2016-10-11 13:19:20 -07:00
Jakub Zelenka 1b1b7f8809 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-13 18:27:55 +01:00
Jakub Zelenka 3a739c9f9f Merge branch 'PHP-5.6' into PHP-7.0 2016-09-13 18:19:20 +01:00
Jakub Zelenka 05baa92727 Fix bug #73072 (Invalid path SNI_server_certs causes segfault) 2016-09-13 18:15:34 +01:00