helly Fri Dec 13 04:17:04 2002 EDT
Modified files:
/php4/ext/openssl openssl.c
Log:
MFB: ZTS fix by Ilia
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.58 php4/ext/openssl/openssl.c:1.59
--- php4/ext/openssl/openssl.c:1.58 Thu Dec 12 09:12:41 2002
+++ php4/ext/openssl/openssl.c Fri Dec 13 04:17:03 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.58 2002/12/12 14:12:41 helly Exp $ */
+/* $Id: openssl.c,v 1.59 2002/12/13 09:17:03 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1685,7 +1685,7 @@
}
else if (type == le_key) {
/* check whether it is actually a private key if requested */
- if (!public_key &&
!php_openssl_is_private_key((EVP_PKEY*)what))
+ if (!public_key && !php_openssl_is_private_key((EVP_PKEY*)what
+TSRMLS_CC))
{
php_error_docref(NULL TSRMLS_CC, E_WARNING, "supplied
key param is a public key");
return NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
