| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
| |
Also use persistent memory to prevent segfualt
|
| |
|
| |
|
|\
| |
| |
| |
| | |
* PHP-5.6:
Happy new year (Update copyright to 2016)
|
| | |
|
|\ \
| |/
| |
| |
| | |
* PHP-5.6:
Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
with extra certs
Squashed commit of the following:
commit a64c1d9bc4c129fd946a478bdcb55101e42157b7
Author: Tomasz Sawicki <falundir@gmail.com>
Date: Wed Jun 24 08:49:37 2015 +0200
Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
The "key values mismatch" error is triggered in openssl_pkcs12_read by
PKCS12_parse, because it uses X509_check_private_key to separate main
certificate (which corresponds to private key) from extra certificates.
Extra certificates usually comes first (p12 contents are reversed as
stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
error.
The fix pops "key values mismatch" error from OpenSSL error stack for
each extra certificate if there are any.
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
|
|
|
|
|
| |
- All streams-related code now lives in xp_ssl.c. Previously
stream code was split across both openssl.c and xp_ssl.c
- Folded superfluous php_openssl_structs.h into xp_ssl.c
- Server-specific options now set on SSL_CTX instead of SSL
- Deprecate SNI_server_name ctx option
- Miscellaneous refactoring
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.
Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.
Will backport to 5.4 potentially with Stas' approval.
Test Plan:
Ran newly added tests which came from RFC 6070
|
| |
|
|
|
|
|
|
| |
For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
- Fix possible multibyte issues issue in the add_assoc function
- add test for openssl_csr_get_subject
|
| |
|
| |
|
|
|
|
|
| |
- openssl_pkey_get_details(), returns the key details
|
| |
|
| |
|
|
|
|
|
| |
# Should the LICENSE and Zend/LICENSE dates be updated too?
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Main Changes:
- Implement a socket transport layer for use by all code that needs to open
some kind of "special" socket for network or IPC.
- Extensions can register (and override) transports.
- Implement ftruncate() on streams via the ioctl-alike option interface.
- Implement mmap() on streams via the ioctl-alike option interface.
- Implement generic crypto API via the ioctl-alike option interface.
(currently only supports OpenSSL, but could support other SSL toolkits,
and other crypto transport protocols).
Impact:
- tcp sockets can be overloaded by the openssl capable sockets at runtime,
removing the link-time requirement for ssl:// and https:// sockets and
streams.
- checking stream types using PHP_STREAM_IS_SOCKET is deprecated, since
there are now a range of possible socket-type streams.
Working towards:
- socket servers using the new transport layer
- mmap support under win32
- Cleaner code.
# I will be updating the win32 build to add the new files shortly
# after this commit.
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Fix munched file.
# Dunno how that happened.
|
|
|
|
|
| |
some asymmetric RSA encrypt/decrypt functions.
|
|
|
|
|
| |
a bit more friendly to use. See the README for more info.
|
| |
|
|
|
|
|
| |
fixes including init and shutdown functions
|
| |
|
| |
|