From: Kees Monshouwer Date: Wed, 11 May 2016 15:43:28 +0000 (+0200) Subject: s/OPENSSL_USE_ECDSA/HAVE_OPENSSL_ECDSA X-Git-Tag: auth-4.0.0-beta1~17^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b14f4409b8500372e64290b48c3169d361f124a5;p=thirdparty%2Fpdns.git s/OPENSSL_USE_ECDSA/HAVE_OPENSSL_ECDSA --- diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 index 12207f9ff2..587b29d348 100644 --- a/m4/ax_check_openssl.m4 +++ b/m4/ax_check_openssl.m4 @@ -119,7 +119,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ openssl_ecdsa=no ]) AS_IF([test "x$openssl_ecdsa" = "xyes"], [ - AC_DEFINE([OPENSSL_USE_ECDSA], [1], [define to 1 if OpenSSL ecdsa support is avalable.]) + AC_DEFINE([HAVE_OPENSSL_ECDSA], [1], [define to 1 if OpenSSL ecdsa support is avalable.]) ]) $1 ], [ diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc index c420c43a77..3894cd7584 100644 --- a/pdns/opensslsigners.cc +++ b/pdns/opensslsigners.cc @@ -2,7 +2,7 @@ #include "config.h" #endif #include -#ifdef OPENSSL_USE_ECDSA +#ifdef HAVE_OPENSSL_ECDSA #include #endif #include @@ -418,7 +418,7 @@ void OpenSSLRSADNSCryptoKeyEngine::fromPublicKeyString(const std::string& input) d_key = key; } -#ifdef OPENSSL_USE_ECDSA +#ifdef HAVE_OPENSSL_ECDSA class OpenSSLECDSADNSCryptoKeyEngine : public DNSCryptoKeyEngine { public: @@ -731,7 +731,7 @@ namespace { DNSCryptoKeyEngine::report(7, &OpenSSLRSADNSCryptoKeyEngine::maker); DNSCryptoKeyEngine::report(8, &OpenSSLRSADNSCryptoKeyEngine::maker); DNSCryptoKeyEngine::report(10, &OpenSSLRSADNSCryptoKeyEngine::maker); -#ifdef OPENSSL_USE_ECDSA +#ifdef HAVE_OPENSSL_ECDSA DNSCryptoKeyEngine::report(13, &OpenSSLECDSADNSCryptoKeyEngine::maker); DNSCryptoKeyEngine::report(14, &OpenSSLECDSADNSCryptoKeyEngine::maker); #endif