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

939 commits

Author SHA1 Message Date
Nikita Popov
251af7329f Fix nullability of openssl_cms_sign() parameter 2020-10-14 11:34:15 +02:00
Nikita Popov
2540f68d0e Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Allow passing $tag for non-authenticated encryption
 2020-10-14 10:56:51 +02:00
Nikita Popov
6c6a58e930 Allow passing $tag for non-authenticated encryption 
openssl_encrypt() currently throws a warning if the $tag out
parameter is passed for a non-authenticated cipher. This violates
the principle that a function should behave the same if a parameter
is not passed, and if the default value is passed for the parameter.

I believe this warning should simply be dropped and the $tag be
populated with null, as is already the case. Otherwise, it is not
possible to use openssl_encrypt() in generic wrapper APIs, that are
compatible with both authenticated and non-authenticated encryption.

Closes GH-6333.
 2020-10-14 10:54:06 +02:00
Nikita Popov
2cd2ca8884 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Revert "Add missing X509 purpose constants"
 2020-10-12 12:56:21 +02:00
Nikita Popov
41e4a77077 Revert "Add missing X509 purpose constants" 
This reverts commit 1e53e14bc3.

This fails on Travis.
 2020-10-12 12:56:07 +02:00
Nikita Popov
da60849fa1 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Add missing X509 purpose constants
 2020-10-12 11:53:22 +02:00
Vincent JARDIN
1e53e14bc3 Add missing X509 purpose constants 
X509_PURPOSE_OCSP_HELPER, X509_PURPOSE_TIMESTAMP_SIGN are available
from OpenSSL for many years:

  - X509_PURPOSE_OCSP_HELPER, since 2001
  - X509_PURPOSE_TIMESTAMP_SIGN, since 2006

Also drop the ifdef check for X509_PURPOSE_ANY, as it is always
available in supported OpenSSL versions.

Closes GH-6312.
 2020-10-12 11:51:08 +02:00
Nikita Popov
62c6d6952e Add test instantiating all objects 
Intended to find issues in opaque object destructors.

Closes GH-6251.
 2020-10-01 18:37:24 +02:00
Stanislav Malyshev
e14f835d8c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update UPGRADING
  Update UPGRADING
  Update NEWS & UPGRADING
  Do not decode cookie names anymore
  Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
 2020-09-28 22:55:37 -07:00
Stanislav Malyshev
c4dc080245 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update UPGRADING
  Update NEWS & UPGRADING
  Do not decode cookie names anymore
  Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
 2020-09-28 22:54:57 -07:00
Stanislav Malyshev
a9e4321846 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS & UPGRADING
  Do not decode cookie names anymore
  Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
 2020-09-28 21:39:34 -07:00
Stanislav Malyshev
0216630ea2 Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV) 2020-09-26 23:46:53 -07:00
Máté Kocsis
e8e4ddce77
Improve parameter handling in ext/openssl 
Closes GH-6025
 2020-09-12 22:08:41 +02:00
Máté Kocsis
c98d47696f
Consolidate new union type ZPP macro names 
They will now follow the canonical order of types. Older macros are
left intact due to maintaining BC.

Closes GH-6112
 2020-09-11 11:00:18 +02:00
Nikita Popov
3e14942756 Require $method parameter in openssl_seal/openssl_open 
RC4 is considered insecure, and it's not possible to change the
default of these functions. As such, require the method to be
passed explicitly.

Closes GH-6093.
 2020-09-08 14:21:01 +02:00
George Peter Banyard
4522cbb789 Promote various OpenSSL warnings into Errors 
Closes GH-5111
 2020-08-16 18:59:52 +02:00
Nikita Popov
90a2c79be0 Remove some unnnecessary null checks in openssl 
Remove null checks before EVP_PKEY_free and BIO_free. NULL is a
no-op for both of these. Probably applies to most other freeing
function as well...
 2020-08-10 12:10:30 +02:00
Nikita Popov
80d3ce3d19 Improve X509_PKEY management in OpenSSL 
Remove the free_pkey argument from php_openssl_pkey_from_zval,
instead return an EVP_PKEY that always needs to be freed
(by incrementing refcount if necessary).

This makes the code simpler and fixes a number of bugs in the
existing handling.

Closes GH-5946.
 2020-08-10 11:43:49 +02:00
Máté Kocsis
9f44eca6b6
Convert resources to objects in ext/openssl 
Closes GH-5860

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
 2020-08-01 22:47:20 +02:00
Nikita Popov
80b4d49f90 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79881
 2020-07-22 10:21:29 +02:00
Nikita Popov
657a832a77 Fixed bug #79881 2020-07-22 10:21:24 +02:00
Max Semenik
2b5de6f839
Remove proto comments from C files 
Closes GH-5758
 2020-07-06 21:13:34 +02:00
twosee
88355dd338 Constify char * arguments of APIs 
Closes GH-5676.
 2020-06-08 10:38:45 +02:00
Nikita Popov
57e17e58a5 Fix leak in openssl_cms_read() 2020-06-08 10:13:25 +02:00
Eliot Lear
8583b8a9bf Add support for Cryptographic Message Syntax (CMS) 
It add CMS (RFC 5652) support, which is an update to PKCS7.  The functions
are analogous BUT NOT IDENTICAL to openssl_pkcs7*.  In particular, support for
different encodings (PEM, DER, SMIME) is now available.
 2020-06-07 16:58:34 +01:00
George Peter Banyard
999f65c9cd Fix [-Wundef] warning in OpenSSL extension 2020-05-20 18:22:10 +02:00
Máté Kocsis
21cfa03f17
Generate function entries for another batch of extensions 
Closes GH-5352
 2020-04-05 21:15:30 +02:00
Máté Kocsis
01b266aac4
Improve error messages of various extensions 
Closes GH-5278
 2020-03-23 18:59:04 +01:00
Máté Kocsis
736b22dc0b
Add stubs for aliases 
Closes GH-5187
 2020-02-18 21:10:36 +01:00
Christoph M. Becker
7cb1a706bb Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79145: openssl memory leak
 2020-01-21 16:21:39 +01:00
Christoph M. Becker
16a8a608d5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79145: openssl memory leak
 2020-01-21 16:20:04 +01:00
Christoph M. Becker
9eff906a02 Fix #79145: openssl memory leak 
We must increase the refcount of `return_value` only if `cert` is a
resource; this is already done in `php_openssl_evp_from_zval()`,
though.
 2020-01-21 16:17:25 +01:00
Máté Kocsis
d1764ca330
Make error messages more consistent by fixing capitalization 
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
 2020-01-17 14:52:46 +01:00
Máté Kocsis
c3cf01b553
Fix #78880: Yet another batch of spelling errors 2020-01-16 12:04:00 +01:00
Máté Kocsis
bbcfa66e06
Use RETURN_THROWS() after zend_fetch_resource*() 2020-01-03 19:20:56 +01:00
Máté Kocsis
345703724c
Use RETURN_THROWS() during ZPP in most of the extensions 
Except for some bigger ones: reflection, sodium, spl
 2019-12-31 11:46:11 +01:00
Christoph M. Becker
34defbb784 Accept int parameter in the first place 
This is more liberal then before, where that parameter (if given) had
to be IS_LONG, while now it would be converted to int according to weak
typing rules.  This is, however, more what a developer would expect.
 2019-11-01 19:15:48 +01:00
Máté Kocsis
2204dbde3b Add missing ZPP checks 
Closes GH-4878.
 2019-11-01 15:26:52 +01:00
Christoph M. Becker
5dd5f1bc4a Finish OpenSSL arginfo stubs 2019-11-01 15:21:28 +01:00
Máté Kocsis
9493893412 Cleanup return values when parameter parsing is unsuccessful 2019-10-30 16:05:20 +01:00
Rimvydas Zilinskas
e4593c51ff Add more openssl stubs 
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
 2019-10-30 11:20:48 +01:00
Gabriel Caruso
95181553c8
Add missing zend_parse_parameters_none() checks 
Closes GH-4796.
 2019-10-08 23:10:18 +02:00
Gabriel Caruso
5d6e923d46
Remove mention of PHP major version in Copyright headers 
Closes GH-4732.
 2019-09-25 14:51:43 +02:00
Rimvydas Zilinskas
31d7f9763b Add partial openssl stubs 
Closes GH-4509.
 2019-08-10 22:19:16 +02:00
Nikita Popov
699b465da2 Fixed bug #78391 2019-08-09 15:03:40 +02:00
Nikita Popov
4276d669d2 Merge branch 'PHP-7.4' 2019-08-09 15:02:57 +02:00
Nikita Popov
69a771346a Fixed bug #78391 2019-08-09 15:02:44 +02:00
Nikita Popov
d8b2b070ec Merge branch 'PHP-7.4' 2019-06-21 15:08:20 +02:00
Nikita Popov
021bb35aec Merge branch 'PHP-7.3' into PHP-7.4 2019-06-21 15:08:12 +02:00
Nikita Popov
66e4b78519 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-21 15:07:59 +02:00