Permalink
Browse files

Fixed bug #39394 (Missing check for older variants of openssl).

  • Loading branch information...
1 parent a688c62 commit 8df326e00366c77261f5b364749f81ca242ef016 Ilia Alshanetsky committed Jan 7, 2007
Showing with 5 additions and 1 deletion.
  1. +1 −0 NEWS
  2. +1 −0 ext/openssl/config.w32
  3. +2 −0 ext/openssl/config0.m4
  4. +1 −1 ext/openssl/openssl.c
View
@@ -9,6 +9,7 @@ PHP NEWS
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)
@@ -11,6 +11,7 @@ if (PHP_OPENSSL != "no") {
AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have openssl");
AC_DEFINE("HAVE_OPENSSL", 1);
+ AC_DEFINE("HAVE_DSA_DEFAULT_METHOD", 1);
}
}
@@ -16,6 +16,8 @@ if test "$PHP_OPENSSL" != "no"; then
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,[ ])
@@ -2056,7 +2056,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req
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);

0 comments on commit 8df326e

Please sign in to comment.