clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
131,257 Commits 491 Branches 1,363 Tags 838 MiB
36f78862c8
Commit Graph

1836 Commits

Author SHA1 Message Date
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
Ilia Alshanetsky
f65e8488d7 Fixed a small memory leak when a NULL variable is passed to 
openssl_csr_sign() as the first argument.
 2003-01-02 21:18:59 +00:00
Sebastian Bergmann
b506f5c8f8 Bump year. 2002-12-31 16:08:15 +00:00
Marcus Boerger
95c701d328 MFB: ZTS fix by Ilia 2002-12-13 09:17:04 +00:00
Wez Furlong
81c02040f0 Attempt to add more entropy for key generation. 2002-12-12 15:50:11 +00:00
Marcus Boerger
c2078cdabf php_error -> php_error_docref conversion fix (noticed by derick) 2002-12-12 14:12:42 +00:00
Wez Furlong
1ef74a4f79 Patch for #20936 (openssl: public key handling was broken). 
Thanks to <jeroen@derks.it> for the patch.
 2002-12-12 13:42:23 +00:00
Marcus Boerger
835c4dedbb typeconversion is needed here for cygwin 2002-12-12 12:18:44 +00:00
Ilia Alshanetsky
08e020a870 ZTS fix. 2002-12-11 07:29:51 +00:00
Ilia Alshanetsky
533d3273bd Fix ZTS build 2002-12-11 02:30:00 +00:00
Wez Furlong
ac8469bd55 No longer experimental 2002-12-10 22:21:34 +00:00
Wez Furlong
9746be4779 use php_error_docref and tidy up some WS/coding standards. 2002-12-10 22:18:58 +00:00
Edin Kadribasic
a2c170e296 Fixed windows build. Symbol PHP_EXPORTS is a no-no for dynamically 
linked extensions.
 2002-11-11 16:11:32 +00:00
Ilia Alshanetsky
cc85828811 Fixed bug #19935. Made OpenSSL file system operations abide by safe_mode 
& open_basedir restrictions.
 2002-11-10 05:19:40 +00:00
Wez Furlong
0c7a386b3e correct proto 2002-08-10 20:19:49 +00:00
Wez Furlong
9eb215511f syntax highlighting for vim 2002-08-09 20:56:52 +00:00
foobar
36fbe5c933 Fixed bug: #18295. e_os.h is not supposed to be included.. 2002-07-12 21:46:36 +00:00
foobar
ce379abfbd Fixed bug: #17751 (typo) 2002-06-13 19:41:25 +00:00
Wez Furlong
7ae1630a97 proto tweak 2002-05-17 12:42:40 +00:00
Wez Furlong
3a68052828 Fix for #16885 2002-05-01 08:22:17 +00:00
Wez Furlong
f571438d7a Probable fix for #16940. 2002-05-01 07:50:13 +00:00
Yasuo Ohgaki
fe6990cc6b Remove compiler warnings 2002-04-19 07:56:41 +00:00
Wez Furlong
4df5076d2f fix build with ZE2 2002-04-12 19:26:08 +00:00
Wez Furlong
959021a8c9 Add subject hash to parsed x509 data. 
Make the test use file_get_contents().
 2002-03-28 00:56:19 +00:00
Wez Furlong
74749ad642 Fix regular openssl_pkey_get_private($content, $phrase) syntax and 
add test case.
This stuff should be merged into the 4.2 branch.
 2002-03-26 00:03:11 +00:00
foobar
4a0291d238 - Make it possible to build ext/openssl as shared extension 2002-03-20 02:07:11 +00:00
Sascha Schumann
5cba3a99c2 extension converted automatically to PHP_NEW_EXTENSION. Manually confirmed 2002-03-12 16:44:00 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Derick Rethans
d26afcf366 - Fix for openssl_pkcs7_sign segfaults 
(patch by Christian Stocker <chregu@php.net>)
 2002-01-31 09:57:28 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Hartmut Holzgraefe
94737d086f proto fix 2001-12-07 07:27:00 +00:00
Hartmut Holzgraefe
250aded265 proto fixes 2001-12-06 17:51:48 +00:00
foobar
f1397d5339 Unified the configure messages. 2001-11-30 19:00:13 +00:00
Stig Bakken
689252082c * zend_module_entry change: apino, debug and zts are moved first, 
see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
 2001-10-11 23:33:59 +00:00
Daniel Beulshausen
1ac3aa7e08 nuke unnecessary force-by-ref declarations + name the needed in a proper way 2001-10-05 15:56:42 +00:00
Daniel Beulshausen
377d88cec0 use maxpathlen instead of path_max 2001-10-04 20:10:58 +00:00
Stig Venaas
b055912861 Didn't compile, replaced some TSRMLS_C with TSRMLS_CC 2001-09-30 13:30:18 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Egon Schmid
88713e4d8d Fixed some protos. Haven't read the source code, so some protos could be wrong. bool notext=true looks very strange to me. 2001-09-11 01:03:59 +00:00
Wez Furlong
671b46a0db Revise the xxx_export api so that exporting to files is comfortable. 2001-09-11 00:33:25 +00:00
Wez Furlong
0f835fdf28 Arrrgghh! 
Fix munched file.
# Dunno how that happened.
 2001-09-11 00:03:58 +00:00
Wez Furlong
3b8f3cc439 Added some preliminary x509 cert and csr creation/signing functions. 
Also, some problems with CGI initialization should be eliminated.
Renamed some pkey functions to be more consistent.
# Added aliases for older names; not sure if we should keep those.
 2001-09-10 23:57:10 +00:00
Daniel Beulshausen
87d7284e46 don't forget TSRMLS_CC when using zend_parse_parameters 2001-09-10 14:30:10 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Wez Furlong
3ed4cc33ac API update: use zend_parse_parameters 2001-09-07 17:09:56 +00:00
Zeev Suraski
e140b35b04 API update 2001-08-21 12:57:53 +00:00
foobar
474da88b4c more ZTS fixes. 2001-07-31 23:47:35 +00:00
Zeev Suraski
aa1772ca72 More TSRMLS_FETCH annihilation 2001-07-31 05:44:11 +00:00
Zeev Suraski
c43806f415 Zend compatibility patch 2001-07-30 08:24:42 +00:00
Zeev Suraski
7b1c400631 More TSRMLS_FETCH annihilation (Zend compatibility patch) 2001-07-30 04:58:07 +00:00
Wez Furlong
8ca519ca88 Change a load of E_ERRORS into E_WARNINGs; it was being a bit too severe, 
which meant that scripts could not identify (or even display) errors before
PHP bailed out.
 2001-07-05 21:18:21 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus 
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
 2001-06-05 13:12:10 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Wez Furlong
080fdabc85 Added Sascha Kettler to credits 2001-05-05 11:29:01 +00:00
Wez Furlong
b379cd968c Merged and adapted a patch from Sascha Kettler <kettler@gmx.net> that provides 
some asymmetric RSA encrypt/decrypt functions.
 2001-05-04 23:42:11 +00:00
Andi Gutmans
4c823e8a89 - Change macros from V_ to VCWD_ because of AIX name clash 2001-04-30 12:45:02 +00:00
Wez Furlong
486d3bef18 Fix for Bug #10168 (is_dst undeclared) 2001-04-05 08:40:27 +00:00
Wez Furlong
1d71f04b44 changed the flags parameters to be a bitfield + constants (I don't know what 
I was thinking!).  Added a couple of extra parameters so that the equivalent
functionality of the openssl smime command can be pretty much used in full.
Added some more error reporting.
 2001-04-02 23:14:01 +00:00
Wez Furlong
4fa9c7477b added some more error reporting and did a little tidying. 2001-04-02 01:31:08 +00:00
Wez Furlong
4cec53ac28 Added whole bunch of PKCS7 (S/MIME) functions and made the key/cert params 
a bit more friendly to use.  See the README for more info.
 2001-04-01 23:06:15 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Egon Schmid
6ec31afcb1 Fixed some protos. 2001-01-26 20:42:51 +00:00
foobar
809bf95a90 Added some missing EXPERIMENTAL files plus some missing extensions 
into EXTENSIONS file.
 2001-01-19 13:43:41 +00:00
Stig Venaas
fe98565b60 Realized that emalloc() never returns NULL, simplified code 2001-01-13 09:16:36 +00:00
Stig Venaas
59fa3f3d04 Made OpenSSL extension work with 0.9.5 and changed version check to 0.9.5 2001-01-07 11:36:15 +00:00
Stig Venaas
db0d2c9bd6 Added README on usage, and added myself to CREDITS 2000-11-23 19:30:47 +00:00
Hartmut Holzgraefe
1f6878e912 2nd step towards auto-credits 2000-11-20 10:33:33 +00:00
Stig Venaas
b81828864f Added optional passphrase argument to openssl_get_privatekey() 
@- Added OpenSSL extension (Stig Venaas)
 2000-11-17 19:49:13 +00:00
Stig Venaas
8b500cdcdf Renamed openssl_read_privatekey openssl_get_privatekey, and some minor 
fixes including init and shutdown functions
 2000-11-17 19:17:07 +00:00
foobar
6a81095313 extname -> openssl 2000-11-16 11:16:25 +00:00
Stig Venaas
eca0bd0f39 Changed to use Z_LVAL_PP, Z_STRVAL_PP and Z_STRLEN_PP. 2000-11-14 17:05:39 +00:00
Stig Venaas
f3a17761be Made API simpler 2000-11-14 09:54:25 +00:00
Daniel Beulshausen
c1e1bc07ff added dsp for openssl win32 2000-11-13 20:24:23 +00:00
Stig Venaas
86b7cd0572 OpenSSL extension. So far it implements assymetric encryption functions. 2000-11-13 19:47:20 +00:00