archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
102961 commits 526 branches 1434 tags 879 MiB
Commit graph

1271 commits

Author SHA1 Message Date
Anatol Belski
174c3371bd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix typo
 2016-06-06 08:58:08 +02:00
Anatol Belski
eaef8f6db2 fix typo 2016-06-06 08:56:40 +02:00
Anatol Belski
db68121da8 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix broken skipif and add xfail for now
 2016-06-06 08:23:22 +02:00
Anatol Belski
075c75873e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix broken skipif and add xfail for now
 2016-06-06 08:21:39 +02:00
Anatol Belski
1b2afd478b fix broken skipif and add xfail for now 2016-06-06 08:20:01 +02:00
Jakub Zelenka
da83e4295a Merge branch 'PHP-7.0' 2016-06-05 17:31:05 +01:00
Jakub Zelenka
1f7535234e Merge branch 'PHP-5.6' into PHP-7.0 2016-06-05 17:30:03 +01:00
Jakub Zelenka
d4615d1118 Add new test for openssl_pkey_new 2016-06-05 17:27:47 +01:00
Jakub Zelenka
497fe33d6f Add test for openssl_error_string 
This test is important for making sure that the error strings
from OpenSSL works as expected and we can safely add a fix
for storing the strings that is prepared.
 2016-06-05 17:23:05 +01:00
Jakub Zelenka
5e9f387175 Remove openssl_x509_parse for OpenSSL 0.9.x 
The test is unstable and it actually fails with latest 0.9.8
 2016-06-05 16:28:50 +01:00
Anatol Belski
80f91fd9d5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Re-fix #72165
  Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
 2016-05-06 09:33:22 +02:00
Anatol Belski
5afba67bfe Re-fix #72165 
Reverted previous wrong patch, throw warning for numeric keys.
Numeric field names are not supported, see "distinguished name"
section here https://www.openssl.org/docs/manmaster/apps/req.html
 2016-05-06 09:30:41 +02:00
Anatol Belski
dd5479ea4c Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new" 
This reverts commit 7277c85765.
 2016-05-06 09:19:04 +02:00
Anatol Belski
20ae634bf0 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72165 Null pointer dereference - openssl_csr_new
 2016-05-06 09:02:14 +02:00
Anatol Belski
7277c85765 Fixed bug #72165 Null pointer dereference - openssl_csr_new 2016-05-06 09:01:27 +02:00
Joe Watkins
66fc5a3436 Implement #51879 stream context socket option tcp_nodelay 2016-04-29 12:11:58 +01:00
Jakub Zelenka
6ac8bc4ecb Merge branch 'openssl_error_store' of github.com:bukka/php-src into openssl_error_store 2016-04-03 19:56:15 +01:00
Jakub Zelenka
df85331220 Correctly store OpenSSL erorrs for encrypt_key 2016-04-03 19:54:39 +01:00
Jakub Zelenka
79dd71b151 Store OpenSSL errors from CONF_get_string in SET_OPTIONAL_STRING_ARG 2016-04-03 19:51:22 +01:00
marcosptf
5cd9c3bd71 test to function openssl_free_key($loaded_key); 
was added a new test to openssl module to coverage openssl_free_key($loaded_key); function
 2016-03-13 10:53:34 -03:00
Jakub Zelenka
7a4cc73641 Merge branch 'openssl_error_store' into openssl_aead_with_error_store 2016-02-29 19:34:39 +00:00
Jakub Zelenka
70141093a7 Merge branch 'master' into openssl_aead 2016-02-29 19:31:20 +00:00
Jakub Zelenka
80015ba741 Merge branch 'PHP-7.0' into openssl_error_store 2016-02-29 19:28:40 +00:00
Stanislav Malyshev
9afb29aa68 Remove TSRMLS_* from code, they are not used anymore 2016-02-17 22:44:05 -08:00
Anatol Belski
343307000e yet two test fixes in openssl in 5.6 2016-02-16 08:28:10 +01:00
Anatol Belski
08086d40a5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  improve test
 2016-02-16 08:06:57 +01:00
Anatol Belski
84014cf733 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  improve test
 2016-02-16 08:06:38 +01:00
Anatol Belski
974dea5e88 improve test 2016-02-16 08:05:16 +01:00
Jakub Zelenka
4ea2a0fd60 Store errors in openssl_random_pseudo_bytes 2016-02-14 19:25:14 +00:00
Nikita Popov
2d605e5f24 Merge branch 'PHP-7.0' 2016-02-14 14:47:42 +01:00
Nikita Popov
c9357f82d3 Format string fixes 
Conflicts:
	ext/pgsql/pgsql.c
 2016-02-14 14:45:53 +01:00
Jakub Zelenka
664d693513 Store errors in openssl_dh_compute_key 2016-02-08 19:35:47 +00:00
Jakub Zelenka
9b094be5f7 Store errors in openssl_encrypt and openssl_decrypt 2016-02-07 16:40:21 +00:00
Jakub Zelenka
34eb6b53cc Store errors in openssl_digest 2016-02-05 15:32:19 +00:00
Rob Thomas
2854f3292d Fix patch to work against PHP7 
This also updates the testcases so they now return correct data
with the extra return value.
 2016-02-05 10:19:02 +10:00
Rob Thomas
73bae6b065 Add 'serialNumberHex' variable to openssl_x509_parse 
Currently, openssl_x509_parse returns an integer. This can be
unexpected, as the common way of handling serial numbers is with
a hex string.

This is compounded as  php's dechex() function cannot handle >32
bit numbers which will leave people trying to handle large serial
numbers frustrated.

By adding this extra return variable to openssl_x509_parse, the
consumer of the variable is certain that the serialNumberHex that
is returned is the exact Hex Serial number as OpenSSL returns
everywhere else.
 2016-02-05 08:21:47 +10:00
Jakub Zelenka
2a9dd980bf Merge branch 'PHP-7.0' 2016-02-04 16:57:41 +00:00
Jakub Zelenka
1ff88d3945 Merge branch 'PHP-5.6' into PHP-7.0 2016-02-04 16:54:44 +00:00
Jakub Zelenka
feab5e6fa0 Split and clean up OpenSSL X509 tests 2016-02-04 16:51:36 +00:00
Jakub Zelenka
899d2b2126 Store errors in openssl_seal and openssl_open 2016-02-04 12:30:53 +00:00
Jakub Zelenka
95a48213a0 Merge branch 'PHP-7.0' into openssl_error_store 2016-02-03 16:30:19 +00:00
Jakub Zelenka
fd6f32f667 Merge branch 'PHP-7.0' 2016-02-03 16:23:37 +00:00
Jakub Zelenka
cdf99ffc69 Merge branch 'PHP-5.6' into PHP-7.0 2016-02-03 16:22:39 +00:00
Jakub Zelenka
1f3906c1ce Rename and clean up OpenSSL tests 2016-02-03 16:20:27 +00:00
Jakub Zelenka
ff1c97f0aa Store errors in openssl_sign and openssl_verify 2016-02-03 13:55:37 +00:00
Jakub Zelenka
c26b87b8ac Rewrite openssl_error_string to use stored errors 2016-02-02 16:26:03 +00:00
Anatol Belski
99d9654f4b Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix directory separator in test
 2016-02-02 09:52:26 +01:00
Anatol Belski
1c2d45d2d1 fix directory separator in test 2016-02-02 09:52:07 +01:00
Stanislav Malyshev
ea35de6e31 Merge branch 'PHP-7.0' 
* PHP-7.0: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...
 2016-02-01 20:46:06 -08:00
Stanislav Malyshev
c631f1ee2b Merge branch 'PHP-7.0.3' into PHP-7.0 
* PHP-7.0.3: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...

Conflicts:
	configure.in
	ext/session/tests/bug69111.phpt
	main/php_version.h
 2016-02-01 20:45:49 -08:00