rrichards Wed Jan 9 16:47:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/openssl openssl.c
Log:
MFH: fix crash when using default algorithm
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.4&r2=1.98.2.5.2.41.2.5&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.4
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.5
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.4 Mon Dec 31 07:17:11 2007
+++ php-src/ext/openssl/openssl.c Wed Jan 9 16:47:25 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.4 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.5 2008/01/09 16:47:25 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3687,7 +3687,7 @@
}
if (method == NULL || Z_TYPE_P(method) == IS_LONG) {
- if (Z_TYPE_P(method) == IS_LONG) {
+ if (method != NULL) {
signature_algo = Z_LVAL_P(method);
}
mdtype = php_openssl_get_evp_md_from_algo(signature_algo);
@@ -3742,7 +3742,7 @@
}
if (method == NULL || Z_TYPE_P(method) == IS_LONG) {
- if (Z_TYPE_P(method) == IS_LONG) {
+ if (method != NULL) {
signature_algo = Z_LVAL_P(method);
}
mdtype = php_openssl_get_evp_md_from_algo(signature_algo);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
