]> granicus.if.org Git - php/commitdiff
Remove HAVE_DSA_DEFAULT_METHOD
authorPeter Kokot <peterkokot@gmail.com>
Mon, 22 Jul 2019 14:01:25 +0000 (16:01 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Mon, 22 Jul 2019 14:02:55 +0000 (16:02 +0200)
Last usage removed via 6a813634052710f3f4bf6e2e03ca1b6c7be3bcee.

Closes GH-4455

ext/mysqlnd/config9.m4
ext/openssl/config.w32

index 806580798e08dc3c28e161755f76d2ee0e477dfe..fa5f856141dbd6d6d69021001232b1fac2a43b2a 100644 (file)
@@ -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
 
index 6e5a4e549dc3cc4ddf77818f9e1ee8402e1d1271..9187d6bfc28f104c1828bab391ac2845fce1c58d 100644 (file)
@@ -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;
-               }
        }
 }