mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-04 07:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
70,811 Commits 503 Branches 1,384 Tags 832 MiB
b4a4db467b
Commit Graph

424 Commits

Author SHA1 Message Date
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
Antony Dovgal
97e9bd1da0 fix test names 2007-05-28 20:03:54 +00:00
Pierre Joye
b49e70f946 - MFH: 
- tests for #39217
 - skip test if openssl is too old
 2007-05-28 13:55:30 +00:00
Ilia Alshanetsky
d2ec6b60da Fixed bug #41236 (Regression in timeout handling of non-blocking SSL 
connections during reads and writes).
 2007-05-27 17:05:51 +00:00
Pierre Joye
26e22f34fa - #41423. PHP assumes wrongly that certain ciphers are enabled in OpenSSL 2007-05-19 22:05:08 +00:00
Ilia Alshanetsky
f752fd4836 Fixed bug #41353 (crash in openssl_pkcs12_read() on invalid input). 2007-05-13 17:37:32 +00:00
Rob Richards
3530b8a2c6 fix win32 build 2007-04-05 18:08:42 +00:00
Pierre Joye
e3bc12631b - MFB: import the right data 005_crt.txt 2007-04-05 09:38:45 +00:00
Pierre Joye
1ace1904e4 - MFH: add missing data for 005.phpt 2007-04-05 09:00:07 +00:00
Antony Dovgal
e0318e21fb fix test 2007-04-05 07:23:56 +00:00
Antony Dovgal
90a277d0ce fix ZTS build 2007-04-05 07:10:07 +00:00
Pierre Joye
6e5875b025 - nuke c++ comments 2007-04-04 22:00:51 +00:00
Pierre Joye
d4fb0108bc - implement #39867, PKCS#12 support 
- Fix possible multibyte issues issue in the add_assoc function
- add test for openssl_csr_get_subject
 2007-04-04 21:24:01 +00:00
Antony Dovgal
e07b83afb2 MFH: fix leak on error 2007-04-04 10:44:55 +00:00
Antony Dovgal
f9d54cbb75 MFH: fix #40750 (openssl stream wrapper ignores default_stream_timeout) 2007-03-14 19:22:14 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Rob Richards
75fdefba0c MFH: fix accessing public key from x509 resource 
add test
fix test under win32
 2007-01-20 22:08:29 +00:00
Ilia Alshanetsky
8df326e003 Fixed bug #39394 (Missing check for older variants of openssl). 2007-01-07 18:38:22 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Rob Richards
cf4c83dd2b Fix win32 build 2006-12-06 13:18:36 +00:00
Ilia Alshanetsky
53a1403b53 Fixed bug #39571 (timeout ssl:// connections). 2006-12-05 01:39:07 +00:00
Pierre Joye
c412409164 - MFH: #39217, serialNumber might be -1 when the value is too big 2006-11-15 23:28:06 +00:00
Antony Dovgal
268984b478 fix compile warning 2006-10-15 21:09:27 +00:00
Hannes Magnusson
942b11a581 fix test 2006-10-13 09:59:21 +00:00
Pierre Joye
fa8f1151aa - fix possible segfault (see test 004) always exists and returns NULL on 
error
 2006-10-09 00:04:11 +00:00
Ilia Alshanetsky
0d9f9b67b7 Fixed bug #39039 (SSL: fatal protocol error when fetching HTTPS from 
servers running Google web server).
 2006-10-05 00:38:02 +00:00
Nuno Lopes
e197ecd16e fix mem leak. hash keys dont need to be strdup'ed 2006-09-16 12:05:13 +00:00
Antony Dovgal
1a6cd5162e remove a leftover 2006-09-12 10:54:01 +00:00
Antony Dovgal
5c6f438319 implement feature request #38731 (openssl_pkey_new does not support DSA key generation) 
patch by marci at balabit dot hu
 2006-09-08 20:10:47 +00:00
Ilia Alshanetsky
7f2cf9b373 Fixed memory leaks in openssl test #004 2006-09-07 14:11:06 +00:00
Antony Dovgal
c57bfd9a66 add test 2006-09-05 14:04:41 +00:00
Antony Dovgal
52d0f82dc3 MFH: init variables 2006-09-05 13:59:26 +00:00
Pierre Joye
532f577fe9 - add OPENSSL_VERSION_TEXT and OPENSSL_VERSION_NUMBER constants 
- skip tests if openssl version < 0.9.7j (known to work)
 2006-09-03 15:31:01 +00:00
Antony Dovgal
821674720a fix test 2006-08-31 13:50:11 +00:00
Antony Dovgal
fb21b5d059 MFH: fix problem with mixed arguments accepted as zval* causing leaks/segfaults when converting to other types 2006-08-31 13:48:17 +00:00
Antony Dovgal
1dd6ee3f6d fix segfault/leak, add test 2006-08-30 21:51:08 +00:00
Antony Dovgal
1f138e7e01 MFH: fix segfault in openssl_seal(), add test 2006-08-30 20:50:04 +00:00
Antony Dovgal
efbb2a4838 fix #38486 (openssl extension does not build correctly) 2006-08-18 13:02:38 +00:00
Pierre Joye
8dc61360c6 - add openssl_csr_get_subject() and openssl_csr_get_public_key() 2006-08-15 20:27:22 +00:00
Pierre Joye
9a79a2f37c - add OPENSSL_KEYTYPE_EC constant 
- openssl_pkey_get_details(), returns the key details
 2006-08-15 00:38:05 +00:00
Ilia Alshanetsky
610b633096 Fixed compiler warning. 2006-07-31 03:41:20 +00:00
Pierre Joye
3786f956e6 - #36732, add req_extensions support to openssl_csr_new and _sign 
(ben at psc dot edu)
- fix leaks in openssl_csr_new and sign
 2006-07-31 00:33:42 +00:00
Pierre Joye
769174c2dc - #28382, add support for x509 extensions 2006-07-30 17:03:13 +00:00
Pierre Joye
5def392ce1 - 38261: openssl_x509_parse leaks with invalid certs 2006-07-30 16:26:20 +00:00
Pierre Joye
509761f96d - silent compiler warnings (signess) 2006-07-30 09:18:07 +00:00
Pierre Joye
3a75600dbb - MFH: make the test more obvious and add an explanation 2006-07-29 23:03:56 +00:00
Pierre Joye
3fe91ed83f - vi happiness++ 2006-07-29 22:52:49 +00:00
Antony Dovgal
9d3233651d improve test 2006-07-29 22:41:20 +00:00
Pierre Joye
47db124cda - #38255, fails on array as well 2006-07-29 22:39:34 +00:00
Pierre Joye
06bd78d720 - forgot the tests 2006-07-29 22:27:55 +00:00
Pierre Joye
46b3f37810 - fix leak when the key is not a valid key (like false or an array) 2006-07-29 22:10:50 +00:00
Pierre Joye
59ddb74938 - fix leaks in openssl context options 2006-05-26 00:32:07 +00:00
Wez Furlong
8f87235107 Add two new context options for ssl: 
"capture_peer_cert" and "capture_peer_cert_chain"

If true, the peer certificate and peer certificate chain respectively will be
captured and made available in the ssl context variables "peer_certificate" and
"peer_certificate_chain" respectively.  The certificates are exposed as x509
certificate resources and can be inspected using the existing openssl extension
functions.

This allows applications to perform extended validation.
 2006-04-30 23:43:46 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
Ilia Alshanetsky
f34a85bc58 Improve "skip" checks 2005-12-27 17:16:41 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
foobar
d69ab24f69 MFH: - Fixed bug #35381 (ssl library is not initialized properly) 2005-11-28 11:37:43 +00:00
Dmitry Stogov
8a39d704c4 Fixed memory allocation bug 2005-09-07 15:36:31 +00:00
foobar
9477097564 MFH: Nuked EOLs from error messages 2005-08-18 13:34:41 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Wez Furlong
efc6ccaa01 Add optional parameter to openssl_pkcs7_verify() which specifies the name 
of a file that will be filled with the verified data, but with the signature
information stripped.

Patch by Marton Kenyeres, mkenyeres (at) konvergencia dot hu
 2005-06-30 14:25:41 +00:00
foobar
b8ac8eeca6 - Never use Z_TYPE* macros on non-zvals. 2005-04-19 22:04:28 +00:00
Ilia Alshanetsky
8c38ac19bf Fixed possible usage of str without being initialized. 2005-03-15 00:27:52 +00:00
foobar
005b2d77bf - Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly) 2005-03-14 21:00:03 +00:00
Wez Furlong
126e524635 Fix build... 2005-01-01 14:32:59 +00:00
foobar
5ac375a40d - Fixed bug #31101 (missing kerberos header file path with --with-openssl) 2004-12-30 14:50:06 +00:00
Wez Furlong
843807c647 When a socket is non-blocking, don't block ssl enabled sockets. 
Allow for non-blocking negotiation when calling stream_socket_enable_crypto().
That function will return the foolowing values:

false - negotiation failed
0     - try again when more data is available (only for non-blocking sockets)
true  - ssl was enabled
 2004-12-25 02:02:56 +00:00
Joe Orton
ee39ec7d0a Remove unused variable. 2004-11-03 13:12:41 +00:00
Wez Furlong
c8cc96e6fe Fix possible crash; patch by Kamesh Jayachandran 2004-10-27 11:07:26 +00:00
Wez Furlong
0a4127a610 Fix for Bug #29418 (double free when openssl_csr_new fails). 
Also hook up MSHUTDOWN function which appears to have never been enabled.

Patch by Kamesh Jayachandran
 2004-10-26 09:24:07 +00:00
Anantha Kesari H Y
7387db4366 Included select.h for NetWare 2004-09-29 10:28:17 +00:00
Wez Furlong
99e290f882 Fix for Bug #24189: possibly unsafe select(2) usage. 
We avoid the problem by using poll(2).

On systems without poll(2) (older bsd-ish systems, and win32), we emulate
poll(2) using select(2) and check for valid descriptors before attempting
to access them via the descriptor sets.

If an out-of-range descriptor is detected, an E_WARNING is raised suggesting
that PHP should be recompiled with a larger FD_SETSIZE (and also with a
suggested value).

Most uses of select(2) in the source are to poll a single descriptor, so
a couple of handy wrapper functions have been added to make this easier.

A configure option --enable-fd-setsize has been added to both the unix and
win32 builds; on unix we default to 16384 and on windows we default to 256.
Windows FD_SETSIZE imposes a limit on the maximum number of descriptors that
can be select()ed at once, whereas the unix FD_SETSIZE limit is based on the
highest numbered descriptor; 256 should be plenty for PHP scripts under windows
(the default OS setting is 64).

The win32 specific parts are untested; will do that now.
 2004-09-17 12:44:56 +00:00
Magnus M��tt�
17c77a54bf Add missing stream unregister for sslv2 and 3. 2004-09-13 18:30:30 +00:00
Wez Furlong
0bc0ccce2b Fix Bug #29296: add explicit sslv2 and sslv3 transports 2004-09-10 11:43:47 +00:00
Anantha Kesari H Y
d725f3af91 NetWare specific openssl build file 2004-07-16 08:59:24 +00:00
Wez Furlong
ad99c124c4 Finally a fix for #23220: IIS does not cleanly close SSL connections. 
Also enable the safe and recommended bug work around options in the SSL
context.
 2004-05-23 10:36:08 +00:00
Marcus Boerger
29cfd6d24f - Remove unused blocks 2004-05-19 08:56:50 +00:00
Wez Furlong
e9920ede1f Fix bug #28096 - stream_socket_accept() on an SSL server socket doesn't 
enable SSL on the accepted socket.

- Add cipher list context option
- Add helpful hint about why SSL server socket fails with mysterious
  error (eg: you need an SSL certificate for most ciphers).
 2004-04-21 23:02:06 +00:00
Ilia Alshanetsky
0d0fffe98b Fixed compiler warnings. 2004-03-29 19:57:51 +00:00
foobar
f4983c0d3f - Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5 2004-01-17 13:00:38 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too.. 
# Should the LICENSE and Zend/LICENSE dates be updated too?
 2004-01-08 17:33:29 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Ilia Alshanetsky
cba426ca13 Fixed uninitialized usage of mdtype when unknown signature algorithm is 
found.
 2003-12-21 18:17:20 +00:00
Wez Furlong
43b0ae0a04 openssl support for the new build 2003-12-05 23:13:30 +00:00
Ilia Alshanetsky
22142c392c Fixed compiler warning due to unused variables. 2003-12-03 15:50:27 +00:00
Wez Furlong
6d86bb9e40 (sort of) MFB, feof fix for sockets. 2003-11-28 23:20:23 +00:00
Wez Furlong
eaf0942c8b Port liveness and SSL CA validation from 4.3 branch. 
Make stream_select() work on ssl-enabled sockets again.
 2003-11-27 17:40:16 +00:00
Wez Furlong
42ae98d7a2 Fix unintialized variable. 
Patch by Joe Orton.
 2003-10-13 11:43:14 +00:00
Wez Furlong
e087da60dc And this EOF flag... 2003-10-08 11:23:47 +00:00
Wez Furlong
f7d32e30b0 Fix 2003-09-24 10:35:20 +00:00
foobar
08effa1b04 Fixed typo. 2003-09-23 19:29:34 +00:00
Wez Furlong
fce7b92891 MFB 25614 "fix" 2003-09-23 16:05:52 +00:00
Wez Furlong
ad93053ec4 Merge remaining code from 4.3 to fix #22238 in HEAD. 2003-09-21 18:02:08 +00:00
Ilia Alshanetsky
9c82b1fa75 Fixed compiler warnings. 2003-08-31 20:45:51 +00:00
Zeev Suraski
8767205afa Fix Win32 linkage problems 2003-08-31 12:41:53 +00:00
Zeev Suraski
538d58dd5f Use new infrastructure. 
There are bound to be some messups, please report build/runtime bugs!
 2003-08-03 17:44:39 +00:00
Stefan Roehrich
750635d131 Allow setting of the serial number. 2003-07-13 09:54:42 +00:00
Stefan Roehrich
80ee75f11e Fixed certificate version (counting begins with 0, so 2 means version 3). 2003-07-13 09:38:32 +00:00
foobar
3a7ca909be - HAVE_OPENSSL_EXT is not defined always. 2003-06-27 16:41:41 +00:00
foobar
e3cd8fac9b - Unified PHP_SETUP_OPENSSL with other PHP_SETUP_* macros. 2003-06-24 14:05:26 +00:00
Edin Kadribasic
6e2743023b Win32 build fixes for openssl 2003-06-15 23:34:46 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Ilia Alshanetsky
b19f3302eb MFB 2003-06-08 23:52:29 +00:00
Ilia Alshanetsky
c511cd2242 emalloc -> safe_emalloc 2003-04-28 22:42:22 +00:00
Sara Golemon
a8711474c0 Debug watches probably don't belong in CVS. 2003-04-05 17:31:34 +00:00
Wez Furlong
16dae2eba0 Fix const warning 2003-03-31 17:58:29 +00:00
Derick Rethans
07dd6f49ff - Typo and some whitespace 2003-03-30 22:29:22 +00:00
Derick Rethans
27496361d5 - Added optional parameter to openssl_sign() to specify the hashing 
algorithm to use. (Patch by Scott <scott@planetscott.ca>)
@- Added optional parameter to openssl_sign() to specify the hashing
@  algorithm to use. (scott@planetscott.ca, Derick)
 2003-03-30 22:25:23 +00:00
Wez Furlong
267db80b21 avoid unsigned issues. 2003-03-18 15:15:10 +00:00
Wez Furlong
b66957c56a fix proto 2003-03-15 13:29:35 +00:00
David Hill
5c90216d2c 64-bit correction to variables passed to zend_parse_parameters 
@64-bit correction to variables passed to zend_parse_parameters (Dave)
 2003-03-06 23:07:28 +00:00
Wez Furlong
1b53a2d12e New user-space functions: 
. stream_socket_client() - similar to fsockopen(), but more powerful.
  . stream_socket_server() - Creates a server socket.
  . stream_socket_accept() - Accept a client connection.
  . stream_socket_get_name() - Get local or remote name of socket.

Tidy up some leaks and debug printfs.
Move more streams functions into streamsfuncs.c and streamsfuncs.h.
 2003-02-28 19:53:21 +00:00
Ilia Alshanetsky
14bf872003 Fixed compiler warnings. 2003-02-28 17:26:28 +00:00
foobar
08b5f6b2b9 - No need to include the ssl headers elsewhere but in ext/openssl 
# ext/ftp doesn't use streams yet so it needs to include them.
 2003-02-28 07:25:15 +00:00
Ilia Alshanetsky
57eabeea29 fixed compiler warnings. 2003-02-27 23:50:55 +00:00
Wez Furlong
76ebaa6ee7 - Move https:// and ftps:// wrapper registration into the openssl module. 
- Expose the http:// and ftp:// wrappers as PHPAPI
- Remove unused variables
 2003-02-27 18:16:35 +00:00
Wez Furlong
fd61f69077 Another big commit (tm). 
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.
 2003-02-27 17:43:38 +00:00
Wez Furlong
79c046d8a8 Add additional optional parameter to openssl_pkcs7_encrypt to specify the 
cipher.  The cipher can be one of the constants listed below.

Based on a patch from:
stefan at cuba dot ionum dot ch

 	OPENSSL_CIPHER_RC2_40,   (the default)
 	OPENSSL_CIPHER_RC2_128,
 	OPENSSL_CIPHER_RC2_64,
 	OPENSSL_CIPHER_DES,
 	OPENSSL_CIPHER_3DES,

proto bool openssl_pkcs7_encrypt(string infile, string outfile,
   mixed recipcerts, array headers [, long flags [, long cipher]])
 2003-02-10 09:49:31 +00:00
Ilia Alshanetsky
31a3135014 Fixed bug #21986 (openssl test failure). 2003-01-31 22:15:56 +00:00
Ilia Alshanetsky
e2868b5788 Removed pointless memory allocation checks. 2003-01-18 19:41:56 +00:00
Ilia Alshanetsky
5f36ce398e CS fixes. 2003-01-04 23:31:55 +00:00