cvs: php4(PHP_4_3) /ext/openssl openssl.c
| From: | Wez Furlong | Date: | Tue, 10 Dec 2002 22:04:43 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/openssl openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17087@lists.php.net to get a copy of this message | ||
wez Tue Dec 10 17:04:43 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/openssl openssl.c
Log:
Fix proto and avoid potential segfault on an error.
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.52 php4/ext/openssl/openssl.c:1.52.2.1
--- php4/ext/openssl/openssl.c:1.52 Sun Nov 10 00:19:39 2002
+++ php4/ext/openssl/openssl.c Tue Dec 10 17:04:42 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.52 2002/11/10 05:19:39 iliaa Exp $ */
+/* $Id: openssl.c,v 1.52.2.1 2002/12/10 22:04:42 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1543,7 +1543,7 @@
}
/* }}} */
-/* {{{ proto bool openssl_csr_new(array dn, resource &privkey [, array extraattribs, array
configargs])
+/* {{{ proto bool openssl_csr_new(array dn, resource &privkey [, array configargs, array
extraattribs])
Generates a privkey and CSR */
PHP_FUNCTION(openssl_csr_new)
{
@@ -2410,7 +2410,7 @@
padding) == cryptedlen);
break;
default:
- zend_error(E_WARNING, "%s(): key type not supported in this PHP build!");
+ zend_error(E_WARNING, "key type not supported in this PHP build!");
}
if (successful) {
@@ -2427,7 +2427,7 @@
}
/* }}} */
-/* {{{ proto bool openssl_private_decrypt(string data, string decrypted, mixed key [, int padding])
+/* {{{ proto bool openssl_private_decrypt(string data, string &decrypted, mixed key [, int
padding])
Decrypts data with private key */
PHP_FUNCTION(openssl_private_decrypt)
{