iliaa Sun Jan 7 18:38:22 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/openssl openssl.c config0.m4 config.w32
/php-src NEWS
Log:
Fixed bug #39394 (Missing check for older variants of openssl).
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.25&r2=1.98.2.5.2.26&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.25
php-src/ext/openssl/openssl.c:1.98.2.5.2.26
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.25 Mon Jan 1 09:36:04 2007
+++ php-src/ext/openssl/openssl.c Sun Jan 7 18:38:21 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.25 2007/01/01 09:36:04 sebastian Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.26 2007/01/07 18:38:21 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2056,7 +2056,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);
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/config0.m4?r1=1.4&r2=1.4.4.1&diff_format=u
Index: php-src/ext/openssl/config0.m4
diff -u php-src/ext/openssl/config0.m4:1.4
php-src/ext/openssl/config0.m4:1.4.4.1
--- php-src/ext/openssl/config0.m4:1.4 Sat Jan 1 14:32:58 2005
+++ php-src/ext/openssl/config0.m4 Sun Jan 7 18:38:22 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.4 2005/01/01 14:32:58 wez Exp $
+dnl $Id: config0.m4,v 1.4.4.1 2007/01/07 18:38:22 iliaa Exp $
dnl
PHP_ARG_WITH(openssl, for OpenSSL support,
@@ -16,6 +16,8 @@
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi
+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD,
1, [OpenSSL 0.9.7 or later]))
+
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[
AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/config.w32?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/openssl/config.w32
diff -u php-src/ext/openssl/config.w32:1.1
php-src/ext/openssl/config.w32:1.1.6.1
--- php-src/ext/openssl/config.w32:1.1 Fri Dec 5 23:13:27 2003
+++ php-src/ext/openssl/config.w32 Sun Jan 7 18:38:22 2007
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/05 23:13:27 wez Exp $
+// $Id: config.w32,v 1.1.6.1 2007/01/07 18:38:22 iliaa Exp $
// vim:ft=javascript
ARG_WITH("openssl", "OpenSSL support", "no");
@@ -11,6 +11,7 @@
AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have
openssl");
AC_DEFINE("HAVE_OPENSSL", 1);
+ AC_DEFINE("HAVE_DSA_DEFAULT_METHOD", 1);
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.477&r2=1.2027.2.547.2.478&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.477 php-src/NEWS:1.2027.2.547.2.478
--- php-src/NEWS:1.2027.2.547.2.477 Sun Jan 7 04:36:40 2007
+++ php-src/NEWS Sun Jan 7 18:38:22 2007
@@ -9,6 +9,7 @@
establish a new connection). (Ilia)
- Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag,
not entity). (Hannes)
+- Fixed bug #39394 (Missing check for older variants of openssl). (Ilia)
04 Jan 2007, PHP 5.2.1RC2
- Small optimization of the date() function (Matt,Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
