From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 22 Jul 2019 14:01:25 +0000 (+0200)
Subject: Remove HAVE_DSA_DEFAULT_METHOD
X-Git-Tag: php-7.4.0beta1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b03e102c58f56cbf5f794f21face56abd662e90;p=php

Remove HAVE_DSA_DEFAULT_METHOD

Last usage removed via 6a813634052710f3f4bf6e2e03ca1b6c7be3bcee.

Closes GH-4455
---

diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 806580798e..fa5f856141 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -41,9 +41,6 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
 
   if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
-    AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
-    AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
-
     PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, [AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL directly])])
   fi
 
diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32
index 6e5a4e549d..9187d6bfc2 100644
--- a/ext/openssl/config.w32
+++ b/ext/openssl/config.w32
@@ -9,15 +9,5 @@ if (PHP_OPENSSL != "no") {
 		EXTENSION("openssl", "openssl.c xp_ssl.c");
 		AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have openssl");
 		AC_DEFINE("HAVE_OPENSSL", 1);
-
-		switch (ret) {
-			/* Openssl 1.0.x and lower */
-			case 1:
-				AC_DEFINE("HAVE_DSA_DEFAULT_METHOD", 1);
-				break;
-			/* Openssl 1.1.x */
-			case 2:
-				break;
-		}
 	}
 }