clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,343 Commits 494 Branches 1,367 Tags 803 MiB
784850211e
Commit Graph

444 Commits

Author SHA1 Message Date
Pierre Joye
69c3f8cbba - re apply the rng change specific to windows, long term it should be a std function but as this function was badly introduced in the 1st place, we have to fix the bad things here instead, pls do not revert again, bad idea. 2011-07-19 23:01:41 +00:00
Scott MacVicar
591e0e446f Revert change to use a special Windows version of openssl_random_pseudo_bytes(). 
Lets discuss this on internals first. We're advertising something from the OpenSSL library 
and then subverting it with another Windows OS call.

What are the implications of this? Should we make this available in ext/standard/ instead?
 2011-07-19 22:29:55 +00:00
Scott MacVicar
25fb19764a Revert change to use a special Windows version of openssl_random_pseudo_bytes(). 
Lets discuss this on internals first. We're advertising something from the OpenSSL library 
and then subverting it with another Windows OS call.

What are the implications of this? Should we make this available in ext/standard/ instead?
 2011-07-19 22:29:55 +00:00
Scott MacVicar
946456425e openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to the default size for the case of a variable key length cipher. 
The result is a key of 448 bits being passed to the blowfish algorithm would be truncated to 128 bit.

Also fixed an error in the zend_parse_parameters() having an invalid character being used.
 2011-07-19 22:15:56 +00:00
Scott MacVicar
64a0c79a07 openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to the default size for the case of a variable key length cipher. 
The result is a key of 448 bits being passed to the blowfish algorithm would be truncated to 128 bit.

Also fixed an error in the zend_parse_parameters() having an invalid character being used.
 2011-07-19 22:15:56 +00:00
Scott MacVicar
02581a0052 openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to the default size for the case of a variable key length cipher. 
The result is a key of 448 bits being passed to the blowfish algorithm would be truncated to 128 bit.

Also fixed an error in the zend_parse_parameters() having an invalid character being used.
 2011-07-19 22:15:56 +00:00
Pierre Joye
8278f831a5 - use php_win32_get_random_bytes instead of over slow and partially wrong openssl's version 2011-07-10 14:59:33 +00:00
Pierre Joye
5fb2570742 - use php_win32_get_random_bytes instead of over slow and partially wrong openssl's version 2011-07-10 14:59:33 +00:00
Pierre Joye
ccae79a2c3 - did I not kill that already? (do not use rand_screen, pointless on server and not TS) 2011-06-16 13:06:41 +00:00
Pierre Joye
3c8bd9ebb6 - did I not kill that already? (do not use rand_screen, pointless on server and not TS) 2011-06-16 13:06:41 +00:00
Pierre Joye
104cd28e95 - did I not kill that already? (do not use rand_screen, pointless on server and not TS) 2011-06-16 13:06:41 +00:00
Felipe Pena
ddd88ff93c - Fixed bug #55028 (// is abad comment) 2011-06-10 22:48:36 +00:00
Felipe Pena
15f5dd5cb3 - Fixed bug #55028 (// is abad comment) 2011-06-10 22:48:36 +00:00
Felipe Pena
0e37aa144f - Fixed bug #55028 (// is abad comment) 2011-06-10 22:48:36 +00:00
Gustavo André dos Santos Lopes
cd7681d273 - Fixed bug #54992: Stream not closed and error not returned when SSL CN_match 
fails.
 2011-06-08 00:23:02 +00:00
Gustavo André dos Santos Lopes
c27079d9e0 - Fixed bug #54992: Stream not closed and error not returned when SSL CN_match 
fails.
 2011-06-08 00:23:02 +00:00
Gustavo André dos Santos Lopes
2b72c6e7df - Fixed bug #54992: Stream not closed and error not returned when SSL CN_match 
fails.
 2011-06-08 00:23:02 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Scott MacVicar
30f19bd524 Allow management of your own padding in openssl_encrypt/decrypt. 
For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
 2011-05-20 18:56:13 +00:00
Scott MacVicar
9e7ae3b2d0 Allow management of your own padding in openssl_encrypt/decrypt. 
For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
 2011-05-20 18:56:13 +00:00
Martin Jansen
1a4897c88e MFH: The project calls itself OpenSSL and not openSSL, so let's keep it 
that way in our code as well.
 2011-04-25 16:51:12 +00:00
Martin Jansen
0c8438462c The project calls itself OpenSSL and not openSSL, so let's keep it 
that way in our code as well.
 2011-04-25 16:50:30 +00:00
Rasmus Lerdorf
be3d70df4e SSLV2 patch cleanup 2011-04-24 23:27:48 +00:00
Rasmus Lerdorf
380c3e5127 SSLV2 patch cleanup 2011-04-24 23:27:48 +00:00
Rasmus Lerdorf
e575557612 Support for openssl without SSLv2 supprot compiled in. Distros are starting to 
remove support now and this wasn't compiling anymore on my Debian dev box.
 2011-04-24 20:47:22 +00:00
Rasmus Lerdorf
f1806e67e6 Support for openssl without SSLv2 supprot compiled in. Distros are starting to 
remove support now and this wasn't compiling anymore on my Debian dev box.
 2011-04-24 20:47:22 +00:00
Raphael Geissert
a286fa3523 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339 
Patch by Clint Byrum
 2011-03-18 18:47:09 +00:00
Raphael Geissert
5b55a18622 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339 
Patch by Clint Byrum
 2011-03-18 18:47:09 +00:00
Pierre Joye
00b10c6aa3 - fix bug #54061, memory leak in openssl_decrypt 2011-02-21 12:50:26 +00:00
Pierre Joye
32c4a3a061 - fix bug #54061, memory leak in openssl_decrypt 2011-02-21 12:50:26 +00:00
Pierre Joye
69ba87b183 - fix bug #54061, memory leak in openssl_decrypt 2011-02-21 12:47:38 +00:00
Pierre Joye
f922e31129 - fix bug #54061, memory leak in openssl_decrypt 2011-02-21 12:47:38 +00:00
Pierre Joye
7deec592fd - fix test 025 2011-02-21 10:09:50 +00:00
Pierre Joye
b526a6ef44 - fix bug #54060, memory leak in openssl_encrypt 2011-02-21 10:07:31 +00:00
Pierre Joye
5261861d77 - fix bug #54060, memory leak in openssl_encrypt 2011-02-21 10:07:31 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Gustavo André dos Santos Lopes
cd34d68cdd - Fixed bug #53592 (stream_socket_enable_crypto() busy-waits in client mode). 
- Fixed stream_socket_enable_crypto() not honoring the socket timeout in
  server mode.
 2010-12-23 01:44:54 +00:00
Gustavo André dos Santos Lopes
063393f29b - Fixed bug #53592 (stream_socket_enable_crypto() busy-waits in client mode). 
- Fixed stream_socket_enable_crypto() not honoring the socket timeout in
  server mode.
 2010-12-23 01:44:54 +00:00
Adam Harvey
e87fbccfd8 MFH: implement FR #53447 (Cannot disable SessionTicket extension for servers 
that do not support it). Includes Tony's subsequent commit to fix a segfault.
 2010-12-13 08:29:44 +00:00
Antony Dovgal
3722811395 make sure the stream context is present before looking for any options 
and fix segfault
 2010-12-04 21:54:20 +00:00
Adam Harvey
18ec6dae2c Implemented FR #53447 (Cannot disable SessionTicket extension for servers that 
do not support it).

I haven't written a test due to the need for such a test to have a HTTPS server
available which mishandles SessionTicket requests; it's likely that server
administrators will gradually fix this either intentionally or through OpenSSL
upgrades. That said, if there's a great clamoring for a test, I'll work one up.
 2010-12-03 09:34:35 +00:00
Pierre Joye
3fd615cc8d - not TS and useless on server, also not required anymore with the supported windows versions 2010-12-02 11:37:43 +00:00
Pierre Joye
cd62a70863 - not TS and useless on server, also not required anymore with the supported windows versions 2010-12-02 11:37:43 +00:00
Pierre Joye
ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +00:00
Felipe Pena
6e8c2ba690 - Fixed bug #53136 (Invalid read on openssl_csr_new()) 2010-11-12 23:34:03 +00:00
Felipe Pena
c095bec250 - Fixed bug #53136 (Invalid read on openssl_csr_new()) 2010-11-12 23:34:03 +00:00
Adam Harvey
db633fb71d Fix vim marker folds. 2010-10-13 09:23:39 +00:00
Adam Harvey
86944b47a6 Fix vim marker folds. 2010-10-13 09:23:39 +00:00
Ilia Alshanetsky
a4252ab2be Fixed extrenous warning inside openssl_encrypt() for cases where iv not provided, but algo does not require an iv 2010-10-07 12:32:00 +00:00
Ilia Alshanetsky
412d151681 Fixed extrenous warning inside openssl_encrypt() for cases where iv not provided, but algo does not require an iv 2010-10-07 12:32:00 +00:00
Felipe Pena
a5459c09c9 - Fixed bug #52947 (segfault when ssl stream option capture_peer_cert_chain used) 2010-09-29 01:25:35 +00:00
Felipe Pena
2d8a4ea299 - Fixed bug #52947 (segfault when ssl stream option capture_peer_cert_chain used) 2010-09-29 01:25:35 +00:00
Pierre Joye
aa0ed267a2 - use TSRMLS_*C instead of TSRMLS_FETCH in zend_list_insert 2010-09-16 09:13:19 +00:00
Felipe Pena
80926568f1 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) 2010-06-26 16:03:39 +00:00
Felipe Pena
e64734f986 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) 2010-06-26 16:03:39 +00:00
Pierre Joye
276f9a8678 - #48632, ssl AES support 2010-06-21 08:47:25 +00:00
Pierre Joye
6ee4060bfa - #45808, stream_socket_enable_crypto() blocks and eats CPU 2010-06-20 16:33:16 +00:00
Pierre Joye
abde405f1d - #45808, stream_socket_enable_crypto() blocks and eats CPU 2010-06-20 16:33:16 +00:00
Antony Dovgal
797bb31e24 fix ZTS build 2010-05-20 11:20:44 +00:00
Antony Dovgal
4463284456 fix ZTS build 2010-05-20 11:20:44 +00:00
Sara Golemon
2655e63e10 MFH: Add IV to openssl_(en|de)crypt() 
Add openssl_cipher_iv_length()
 2010-05-19 21:18:16 +00:00
Sara Golemon
340d57b13a Add parameter to openssl_(en|de)crypt 2010-05-19 20:05:09 +00:00
Ilia Alshanetsky
5d9b0a4a6f Removed double allocation of buffer inside openssl_random_pseudo_bytes() and cleanup code 2010-05-11 14:31:00 +00:00
Ilia Alshanetsky
c7a553a7fb Removed double allocation of buffer inside openssl_random_pseudo_bytes() and cleanup code 2010-05-11 14:31:00 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Andrey Hristov
af6dd192b3 Fix for bug #51647 Certificate file without private key (pk in another file) doesn't work 2010-04-23 13:54:40 +00:00
Andrey Hristov
e9f9f66f2e Fix for bug #51647 Certificate file without private key (pk in another file) doesn't work 2010-04-23 13:54:40 +00:00
Felipe Pena
a5142d18cb - Fixed compiler warnings 2010-04-23 13:32:03 +00:00
Felipe Pena
6a1ad16066 - Fixed compiler warnings 2010-04-23 13:32:03 +00:00
Antony Dovgal
4646062956 fix typo 2010-04-22 16:00:45 +00:00
Antony Dovgal
c996aea40d revert most of the Andrey's patch that causes segfaults 
(as agreed with Pierre)
 2010-04-22 15:59:44 +00:00
Antony Dovgal
a15efa6979 revert most of the Andrey's patch that causes segfaults 
(as agreed with Pierre)
 2010-04-22 15:59:44 +00:00
Antony Dovgal
a1f753c8e3 initialize variable. this code still segfaults in OpenSSL, no idea why 2010-04-22 11:56:08 +00:00
Antony Dovgal
64a97ee663 initialize variable. this code still segfaults in OpenSSL, no idea why 2010-04-22 11:56:08 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Antony Dovgal
9c97c26832 fix infinite loop in the test 2010-04-20 10:04:26 +00:00
Antony Dovgal
f151e24218 fix infinite loop in the test 2010-04-20 10:04:26 +00:00
Andrey Hristov
dd9fc198ce Fix for bug#49234 method not found ssl_set 
Patch was tested and compiles on Windows. (Thanks Kalle)
 2010-04-15 11:01:30 +00:00
Andrey Hristov
c04f752625 Fix for bug#49234 method not found ssl_set 
Patch was tested and compiles on Windows. (Thanks Kalle)
 2010-04-15 11:01:30 +00:00
Kalle Sommer Nielsen
7ef4cdf471 Remove a couple TSRMLS_FETCH() calls around ext/main/sapi 2010-04-13 11:02:15 +00:00
Ilia Alshanetsky
eb1dc0babf Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation) 2010-01-27 12:55:01 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Arnaud Le Blanc
7c0803a8ca merge from trunk: openssl sni support (rev 289831) 2009-11-30 13:31:53 +00:00
Guenter Knauf
04448f215b added timezone define for NetWare. 2009-11-03 21:26:39 +00:00
Felipe Pena
361d6789f1 - Fixed memory leak in openssl_pkcs12_export_to_file() 2009-10-27 21:37:03 +00:00
Dmitry Stogov
bb81ef5d71 Fixed test (it failed from time to time because of very small timeouts) 2009-09-22 10:15:10 +00:00
Ilia Alshanetsky
62d78d7ccc Fixed certificate validation inside php_openssl_apply_verification_policy 2009-09-14 12:50:30 +00:00
Sriram Natarajan
ac2d3990f2 - Fixed bug #49447 (php engine need to correctly check for socket API 
return status on windows). (Sriram Natarajan)
 2009-09-04 07:59:48 +00:00
Mikko Koppanen
e4c11010f1 Fixes a memory leak in ssl streams. The context was not properly freed 2009-08-22 02:31:23 +00:00
Jani Taskinen
96a053288f - Fixed compile failure with older openssl libs (< 0.9.8), fixes bug #49012 2009-07-30 11:32:08 +00:00
Sriram Natarajan
34d8ee27cc - 48182 ssl handshake fails during asynchronous socket connection 2009-07-28 19:28:08 +00:00
Pierre Joye
f37fabb803 - #48116, restore 0.x compability, thx config.cache. 2009-07-06 23:26:23 +00:00
Pierre Joye
c82245dea7 - #48116, fix build against openssl 1.0 2009-07-06 23:02:18 +00:00
Mikko Koppanen
8e0a3c21a3 MFH: Closes #47991 SSL streams fail if error stack contains items 2009-04-20 09:44:29 +00:00
Pierre Joye
012cd06023 - MFB: better test case, it crashes on more architecture 2009-03-30 18:06:50 +00:00
Scott MacVicar
0570455374 MFH Add test for bug #47828 2009-03-30 09:17:57 +00:00
Scott MacVicar
04566e106a MFH Fix bug #47828 - Converting to UTF-8 can sometimes fail, check error codes and avoid segfault. 2009-03-29 23:32:34 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Scott MacVicar
15a212b259 MFH Fix bug #46748, segfault when SSL has more than one error message. 2008-12-08 11:54:22 +00:00
Pierre Joye
d316c3e0d1 - MFB: fix title 2008-11-18 02:03:38 +00:00
Pierre Joye
d543e3d987 - #41033, enable signing with DSA keys 2008-11-18 01:56:12 +00:00
Scott MacVicar
4525c2d41e Missed test for previous commit 2008-11-17 21:54:47 +00:00
Scott MacVicar
1858b25407 MFH Add openssl_random_pseudo_bytes() in order to expose access to a PRG, this wraps around whatever the OS provides. 
- OpenBSD uses arc4random()
- Windows uses the Windows Crypto API
- FreeBSD, Linux, etc use /dev/random or /dev/urandom if available
[DOC]
 2008-11-17 21:54:25 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Pierre Joye
df3dc8d974 - MFB: skip if pcntl is not present 2008-11-16 23:22:43 +00:00
Pierre Joye
569a48922e - MFH: #46127, php_openssl_tcp_sockop_accept forgets to set context on accepted stream 2008-11-16 23:14:12 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Ilia Alshanetsky
8bd2943877 Fixed compiler warning 2008-10-26 14:35:41 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
1d5ba8bb21 MFH: initialize optional vars 2008-10-21 23:39:15 +00:00
Ilia Alshanetsky
7b57c9e6e1 Fixed bug #46271 (local_cert option is not resolved to full path) 2008-10-14 23:38:41 +00:00
Rob Richards
2e4989cc50 MFH: initialize keyresource 2008-09-30 14:41:49 +00:00
Scott MacVicar
ba2f507871 MFH: Show the library version currently loaded as well as the version the extension was compiled with. Useful for checking PHP is using the latest version. 2008-09-18 16:09:19 +00:00
Ilia Alshanetsky
4c6db91b87 Fixed bug #45382 (timeout bug in stream_socket_enable_crypto). 2008-09-11 23:56:43 +00:00
Antony Dovgal
8127bc0d6b fix folding 2008-07-30 11:59:05 +00:00
Henrique do Nascimento Angelo
158239004e New tests 2008-07-18 23:52:01 +00:00
Antony Dovgal
56ba1f9e80 fix test 2008-07-15 09:14:28 +00:00
Henrique do Nascimento Angelo
0890b92f86 Fix error message 2008-07-15 03:20:44 +00:00
Henrique do Nascimento Angelo
d3538f427a Fix uninitilized variables in openssl_pkcs7_encrypt() and openssl_pkcs7_sign() 2008-07-15 02:59:56 +00:00
Henrique do Nascimento Angelo
8e2248c8b1 Fix segfault caused by openssl_pkey_new() in ext/openssl/tests/006.phpt 2008-07-15 02:43:30 +00:00
Antony Dovgal
cf7e15c3a0 MFH: manage references of stream context properly 2008-07-11 10:25:15 +00:00
Henrique do Nascimento Angelo
4776dfb296 Fix a memory leak on openssl_decrypt() 2008-06-28 09:17:39 +00:00
Hannes Magnusson
0f6e76e502 fix arginfo and proto 2008-06-01 18:24:38 +00:00
Hannes Magnusson
e610609556 Add arginfo & fix protos 2008-06-01 17:54:02 +00:00
Etienne Kneuss
94697acff9 MFH: Fix protos 2008-05-04 21:17:33 +00:00
Hannes Magnusson
72080950ab Fixed bug#44716 (Progress notifications incorrect) 2008-04-14 12:16:07 +00:00
Joe Orton
c3474b9116 MFH: Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build) 
(stotty at tvnet dot hu)
MFH: Fix another case of a broken stream->fd cast in 64-bit builds.
 2008-04-04 13:02:48 +00:00
Antony Dovgal
e96d5501f8 MFH: initialize variable 2008-04-02 14:35:29 +00:00
Felipe Pena
84a8bb038a MFH: New way for check void parameters 2008-03-10 22:15:36 +00:00
Rob Richards
de777461c5 MFH: fix memleak in sign and verify functions 2008-01-15 15:12:47 +00:00
Rob Richards
3aa9268976 MFH: fix crash when using default algorithm 2008-01-09 16:47:25 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Jani Taskinen
f552f91618 MFH: - Fixed bug #43137 (rmdir() and rename() do not clear statcache) 2007-10-31 13:22:45 +00:00
Nuno Lopes
887d439404 use FREE_ZVAL() instead of free() to free a zval 2007-09-29 11:24:05 +00:00
Nuno Lopes
e029a0ee59 fix a few compiler warnings (mostly use of unitialized values) 2007-09-29 11:18:42 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Dmitry Stogov
65741beb79 MFH: Improved ext/openssl 
. Added support for OpenSSL digest functions
. Added support for OpenSSL cipher functions
. Added access to internal values of DSA, RSA and DH keys
 2007-09-27 08:46:00 +00:00
Pierre Joye
e507b4c4ce - fix regression introduced with #42222 (thx to tony and mattias for the 
head up)
 2007-08-08 06:29:46 +00:00
Pierre Joye
455cd3d837 - #42222, forgot this one (thanks mattias) 2007-08-06 19:49:45 +00:00
Pierre Joye
bca0912296 - #42222, truncate the _default to the buffer size (was 200 since day #1, we don't need dynamic alloc here) 2007-08-06 19:11:20 +00:00
Dmitry Stogov
1ad841d53a mproced openssl_x509_parse() to return extensions in readable form 2007-07-11 12:18:14 +00:00
Dmitry Stogov
f765f73e5f Fixed memory leak 2007-07-11 07:36:12 +00:00
Dmitry Stogov
2821378c33 Fixed crash on non-string passphrase 2007-07-11 07:26:52 +00:00
Ilia Alshanetsky
921294e0d7 Fixed bug #41770 (SSL: fatal protocol error due to buffer issues). 2007-07-02 16:42:10 +00:00
Ilia Alshanetsky
e2b093bfcb Fixed a memory leak inside load_all_certs_file() 2007-06-19 22:09:49 +00:00
Antony Dovgal
df057bf78d fix test names 2007-05-30 15:40:26 +00:00
Pierre Joye
f2e130c145 - add missing cert (thx Tony) 2007-05-30 15:16:31 +00:00