pajoye Mon May 28 13:53:54 2007 UTC
Modified files:
/php-src/ext/openssl openssl.c
Log:
- MFB: enable DSA key if HAVE_DSA_DEFAULT_METHOD is set
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.138&r2=1.139&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.138 php-src/ext/openssl/openssl.c:1.139
--- php-src/ext/openssl/openssl.c:1.138 Sat May 19 22:04:27 2007
+++ php-src/ext/openssl/openssl.c Mon May 28 13:53:54 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.138 2007/05/19 22:04:27 pajoye Exp $ */
+/* $Id: openssl.c,v 1.139 2007/05/28 13:53:54 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2399,7 +2399,7 @@
return_val = req->priv_key;
}
break;
-#ifndef NO_DSA
+#if !defined(NO_DSA) && defined(HAVE_DSA_DEFAULT_METHOD)
case OPENSSL_KEYTYPE_DSA:
{
DSA *dsapar =
DSA_generate_parameters(req->priv_key_bits, NULL, 0, NULL, NULL, NULL, NULL);
@@ -3278,7 +3278,7 @@
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
cryptedlen = RSA_private_decrypt(data_len,
- (char *)data,
+ (unsigned char *)data,
crypttemp,
pkey->pkey.rsa,
padding);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
