archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
131427 commits 526 branches 1434 tags 873 MiB
Commit graph

930 commits

Author SHA1 Message Date
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
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
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
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
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
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
Jakub Zelenka
ceddf003a7 Store errors in openssl_(public|private)_(en|de)crypt 2016-02-01 18:42:42 +00:00
Stanislav Malyshev
33b1fbbb5c Fixed bug #71475: openssl_seal() uninitialized memory usage 2016-01-31 20:18:46 -08:00
Jakub Zelenka
32d8cea840 Store errors in OpenSSL PKCS7 functions 2016-01-31 12:36:51 +00:00
Jakub Zelenka
8a251a8ec8 Store errors in openssl_pbkdf2 2016-01-31 11:55:36 +00:00
Jakub Zelenka
62b489287e Store errors in OpenSSL PKEY functions 2016-01-29 15:01:12 +00:00
Jakub Zelenka
538fbcdb7a Store errors in OpenSSL CSR functions 2016-01-29 13:55:24 +00:00
Jakub Zelenka
9d640c0001 Store errors in OpenSSL PKCS12 functions 2016-01-27 15:38:52 +00:00
Jakub Zelenka
f9f9ef2c2e Store errors in openssl_x509_checkpurpose 2016-01-26 16:15:49 +00:00
Xinchen Hui
c58ad955a9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
  Fix memory leak with not freeing OpenSSL errors
  check for NULL and avoid crashes
  Update libmagic.patch for PHP-5.6
  Fixed bug #7143	(finfo throws notice for specific python file)
 2016-01-26 15:57:49 +08:00
Jakub Zelenka
67c1921e2b Merge branch 'PHP-5.6' into PHP-7.0 2016-01-25 17:19:18 +00:00
Jakub Zelenka
a63d0f55da Fix memory leak with not freeing OpenSSL errors 2016-01-25 16:50:16 +00:00
Jakub Zelenka
0e2a5cdc1a Store main errors in openssl_x509_parse 2016-01-22 16:43:23 +00:00
Jakub Zelenka
116d64ff58 Store errors in openssl_x509_fingerprint 2016-01-21 16:41:27 +00:00
Jakub Zelenka
555126e90b Store errors in openssl_x509_export 2016-01-20 20:31:09 +00:00
Jakub Zelenka
63f8ef6ee1 Store errors in OpenSSL SPKI functions 2016-01-19 19:43:48 +00:00
Jakub Zelenka
b5c990c39b Store errors for some OpenSSL RAND handling 2016-01-10 18:28:01 +00:00
Jakub Zelenka
fb3a7e0ef4 Add error storing to the OpenSSL CONF part 2016-01-10 17:38:49 +00:00
Jakub Zelenka
d5a148e237 Use and fix storing errors in openssl_x509_export_to_file 
Also use persistent memory to prevent segfualt
 2016-01-09 18:45:02 +00:00
Jakub Zelenka
19d40fc2b0 Implement logic for OpenSSL error storing 2016-01-09 17:45:08 +00:00
Jakub Zelenka
e453af3851 Warn about passing tag for non AEAD modes 2016-01-09 17:25:53 +00:00
Jakub Zelenka
1d111320b9 Add initial almost empty php_openssl_store_errors 2016-01-08 14:57:31 +00:00
Jakub Zelenka
e00ba47d40 Add global data for storing OpenSSL errors 2016-01-07 16:38:24 +00:00
Jakub Zelenka
ae0ce19fa8 Merge branch 'master' into openssl_aead 2016-01-06 14:43:07 +00:00
Jakub Zelenka
55abb5d395 Fix and test OpenSSL CCM decryption 2016-01-05 14:19:00 +00:00
Jakub Zelenka
9b95dd5e37 Merge branch 'PHP-7.0' 2016-01-04 16:53:30 +00:00
Jakub Zelenka
0ea63cb2a8 Fix small CS label issue in openssl.c 2016-01-04 16:52:52 +00:00
Dominic Luechinger
e4bdf51f0a Replaced whitespaces with tabs and fixed aligments 2016-01-04 16:46:32 +00:00
Jakub Zelenka
5897256d04 Fix and test OpenSSL CCM encryption 2016-01-04 14:07:19 +00:00
Jakub Zelenka
651e6b628b Comment out warning when cipher update fail 
There has never been any warning for that
 2016-01-03 17:24:06 +00:00