clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,623 Commits 491 Branches 1,363 Tags 839 MiB
eca30fd1b1
Commit Graph

1107 Commits

Author SHA1 Message Date
Jakub Zelenka
eca30fd1b1 Merge branch 'PHP-7.1' 2016-10-23 19:40:48 +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
068f6bf938 Merge branch 'pull-request/1814' 2016-10-17 16:50:53 +01:00
Kalle Sommer Nielsen
ba76edcc7c Remove this old and long gone deprecated makefile. Netware was discontinued over 7 years ago and it is safe to say that no one is really maintaining support in php-src anyway for it 2016-10-16 08:52:39 +02:00
Kalle Sommer Nielsen
e63c864609 Fix build, decls first 2016-10-16 06:36:54 +02: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
Anatol Belski
57354e0313 fix test 2016-10-13 10:08:23 +02:00
Stanislav Malyshev
ff75665663 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
 2016-10-12 23:26:15 -07: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
d103a41679 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  followup with #73276 merge
  fix test
  Fix bug #73276 - crash in openssl_random_pseudo_bytes function
  Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
  Fix for #73240 - Write out of bounds at number_format
  avoid strlen
  Bug #73218: add mitigation for ICU int overflow
  Add more locale length checks, due to ICU bugs.
  Fix bug #73150: missing NULL check in dom_document_save_html
  Clear FG(user_stream_current_filename) when bailing out
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  Fix for #73240 - Write out of bounds at number_format
  Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
  set versions
  Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
 2016-10-12 16:06:11 +02: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
Jakub Zelenka
539463395c Merge branch 'PHP-7.1' 2016-09-13 18:28:56 +01: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
Christoph M. Becker
fcc6f2df59 Merge branch 'PHP-7.1' 2016-09-06 14:15:05 +02:00
Christoph M. Becker
727b422ad9 Fix #72948: Uncatchable "Catchable" fatal error for class to string conversions 
E_RECOVERABLE errors are reported as "Catchable fatal error". This is
misleading, because they actually can't be caught via try-catch statements.
Therefore we change the wording to "Recoverable fatal error" as suggested by
Nikita.
 2016-09-03 13:05:37 +02:00
Jakub Zelenka
745bf979cd Merge branch 'PHP-7.1' 2016-08-21 20:29:55 +01:00
Jakub Zelenka
21c72827c7 Do not expect error 0407006A in openssl_private_(en|de)crypt 
It makes the test work with OpenSSL 1.1
 2016-08-21 20:29:03 +01:00
Jakub Zelenka
f13fd9e72a Merge branch 'PHP-7.1' 2016-08-14 20:44:08 +01:00
Jakub Zelenka
427c8c809d Set DSA or DH key only if pub key supplied 2016-08-14 20:42:56 +01:00
Jakub Zelenka
fba632e6d0 Merge branch 'PHP-7.1' 2016-08-14 19:37:29 +01:00
Jakub Zelenka
c3c90abb17 Return false if tag is not supplied or cannot be retrieved in AEAD 
It doesn't make sense to return just encoded string as it cannot be
used anyway (decryption without a tag will not work).
 2016-08-14 19:34:03 +01:00
Jakub Zelenka
9ed2a70757 Merge branch 'PHP-7.1' 2016-08-03 20:07:57 +01:00
Jakub Zelenka
6822af2e73 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.
 2016-08-03 20:01:41 +01:00
Jakub Zelenka
dc6ea028b5 Fix indent in opnenssl_decrypt tests 2016-07-24 13:40:54 +01:00
Mark Jones
e63ceacfca Remove unused DEFAULT_KEY_LENGTH define 2016-07-23 16:04:55 +02:00
Nikita Popov
40b312d4c2 Use OPENSSL_RAW_DATA in raw data decryption tests 2016-07-22 18:30:30 +02:00
Lauri Kenttä
f775199ac7 Require strict base64 in openssl_decode 
Using invalid data in a security-related context makes no sense,
and there's even a test which depends on invalid base64 data failing,
even though it currently fails for the wrong reasons by sheer luck.
 2016-07-22 18:03:55 +02:00
Lauri Kenttä
76f6f3583c Fix test: Use valid base64 even for invalid OpenSSL data 2016-07-22 18:03:55 +02:00
Jakub Zelenka
98ac90b7e2 Add missing X509_get_signature_nid for 1.0.1 2016-07-19 20:13:13 +01:00
Jakub Zelenka
d8580cb286 Use always non const SSL cipher version string 2016-07-19 20:01:20 +01:00
Jakub Zelenka
ea35d309b9 Update authors of openssl.c 2016-07-17 20:48:20 +01:00
Jakub Zelenka
6c497ad2d2 Use opaque EVP_PKEY for new EC logic in openssl_pkey_new 2016-07-17 20:44:33 +01:00
Jakub Zelenka
2ecce94756 Use opaque RSA, DSA and DH 2016-07-17 20:24:34 +01:00
Jakub Zelenka
329f74a11d Add missing creating of md_ctx in openssl_digest 2016-07-17 20:01:37 +01:00
Jakub Zelenka
444adff0b2 Change sign method from ecdsa-with-SHA1 to SHA1 
There are no message digest methods for public key
(e.g. ecdsa-with-SHA1, dsa*, DSA*) MD methods in OpenSSL 1.1.
 2016-07-17 17:46:14 +01:00
Jakub Zelenka
e5780c8cd0 Add missing break in php_openssl_is_private_key 2016-07-17 17:46:14 +01:00
Jakub Zelenka
1008385959 Use SHA1 instead of DSS1 in test for bug #41033 2016-07-17 17:46:14 +01:00
Jakub Zelenka
069d20a33b Hide setting server ECDH curve for OpenSSL 1.1 
It seems to be done automatically
 2016-07-17 17:46:14 +01:00
Jakub Zelenka
1123c85d79 Do not use tmp_rsa_cb for OpenSSL 1.1 
The SSL_CTX_set_tmp_rsa_callback has been removed
 2016-07-17 17:46:14 +01:00
Jakub Zelenka
0afa0b1f83 The DSS1 is not available in OpenSSL 1.1 2016-07-17 17:46:13 +01:00
Jakub Zelenka
d73735a750 Move and use opaque pkey in openssl_dh_compute_key 2016-07-17 17:43:34 +01:00
Jakub Zelenka
1a4e910e8d Use opaque pkey in openssl_pkey_get_details 2016-07-17 17:43:34 +01:00
Jakub Zelenka
f08660bb58 Use EVP_PKEY_base_id where possible 2016-07-17 17:33:42 +01:00