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
133616 commits 526 branches 1434 tags 873 MiB
Commit graph

944 commits

Author SHA1 Message Date
Anatol Belski
f8f8f24024 Merge branch 'PHP-7.1' 
* PHP-7.1:
  follow up fix on bug #74022
 2017-05-18 12:10:17 +02:00
Anatol Belski
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
Anatol Belski
464c1639ae follow up fix on bug #74022 2017-05-18 12:03:13 +02:00
Jakub Zelenka
dccf487b2d Merge branch 'PHP-7.1' 2017-04-30 19:47:23 +01:00
Jakub Zelenka
6028fe511e Fix bug #73808 (iv length warning too restrictive for aes-128-ccm) 2017-04-30 19:46:27 +01:00
Jakub Zelenka
a0b9554f94 Fix possible memory leak in openssl_encrypt and openssl_decrypt 2017-04-27 15:44:26 +01:00
Jakub Zelenka
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
Jakub Zelenka
2e727b9be1 Merge branch 'PHP-7.1' 2017-04-24 17:14:22 +01:00
Jakub Zelenka
7260f65c62 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-24 17:12:55 +01:00
Jakub Zelenka
9fa347997a Fix bug #73833 (null character not allowed in openssl_pkey_get_private) 2017-04-24 17:11:36 +01:00
Jakub Zelenka
488324e315 Merge branch 'PHP-7.1' 2017-04-23 20:33:48 +01:00
Jakub Zelenka
ba83b18ce3 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-23 20:31:24 +01:00
Jakub Zelenka
366b1640d0 Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key) 2017-04-23 20:30:14 +01:00
Xinchen Hui
6bd8ed4dde Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:38 +08:00
Xinchen Hui
3431132f18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:09 +08:00
Xinchen Hui
42e576ace2 Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal) 2017-04-10 19:02:50 +08:00
Jakub Zelenka
cdc33251d2 Add OpenSSL 1.1.0 support to PHP 7.0 2017-04-07 19:21:33 +01:00
Nikita Popov
8aa419c91c Merge branch 'PHP-7.1' 2017-04-02 01:08:42 +02:00
Nikita Popov
32dcc1eef0 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-02 01:08:24 +02:00
Moritz Fain
46d286574b Fixed bug #74341 
Added support for ASN.1 UTCTime without seconds part (being 11 characters
long instead of 13).

Additionally, fixed incorrect handling of DST on systems without gmtoff.
 2017-04-02 01:04:32 +02:00
Nikita Popov
efefb5276b Merge branch 'PHP-7.1' 2017-02-17 21:23:31 +01:00
andrewnester
15b8b124ae Fixed #74099 - Memory leak with openssl_encrypt() 2017-02-17 21:23:16 +01:00
Anatol Belski
2bff68a2f0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
 2017-02-02 13:07:48 +01:00
Anatol Belski
9b9080e85d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
 2017-02-02 13:06:31 +01:00
Anatol Belski
6fc0ae638a Fixed #74022 PHP Fast CGI crashes when reading from a pfx file. 2017-02-02 12:48:12 +01:00
Jakub Zelenka
4a72d340a3 Merge branch 'PHP-7.1' 2017-01-25 19:56:19 +00:00
Jakub Zelenka
519b0dc886 Fix bug #73978 (openssl_decrypt triggers bug in PDO) 2017-01-25 19:55:05 +00:00
Leigh
2a9ee3c6f6 Merge branch 'PHP-7.1' 2017-01-18 15:04:19 +00:00
Leigh
85589ca660 Add php_openssl_store_errors to bailouts 2017-01-18 15:02:52 +00:00
Leigh
9c5a1c8ae9 Merge branch 'PHP-7.1' 2017-01-18 14:48:36 +00:00
Leigh
d2f07edf71 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 14:47:49 +00:00
Leigh
e7e96fe2e0 Change free to OPENSSL_free 2017-01-18 14:45:41 +00:00
Joe Watkins
a1fd706d7d
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Remove more TSRMLS_CC macros
 2017-01-18 10:00:26 +00:00
Thomas Punt
9977bdf9b3
Remove more TSRMLS_CC macros 2017-01-18 10:00:15 +00:00
Joe Watkins
c9c8a301fa
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix memleaks from #1755 and some pre-existing ones
 2017-01-07 10:15:37 +00: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
Joe Watkins
7e3a8ef5e1
Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:41:48 +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
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Jakub Zelenka
42155c3631 Merge branch 'PHP-7.1' 2016-11-27 19:00:57 +00: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
202e95e18f Merge branch 'PHP-7.1' 2016-11-27 18:57:35 +00:00
Jakub Zelenka
0f4216298f Clean up and fix php_openssl_dh_pub_from_priv 2016-11-27 18:54:28 +00:00