From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 12 Apr 2018 12:36:09 +0000 (+0200)
Subject: Fix a warning on botan >= 2.5.0
X-Git-Tag: rec-4.1.3~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07402f6347190f58c698fbead1018a70329b4bd0;p=thirdparty%2Fpdns.git

Fix a warning on botan >= 2.5.0

(cherry picked from commit 7d9895fe11d5371f5d775d9f13a8b52f494021b1)
---

diff --git a/pdns/botansigners.cc b/pdns/botansigners.cc
index 5d7b43b62b..cb04d72894 100644
--- a/pdns/botansigners.cc
+++ b/pdns/botansigners.cc
@@ -26,6 +26,7 @@
 #include <botan/gost_3410.h>
 #include <botan/gost_3411.h>
 #include <botan/pubkey.h>
+#include <botan/version.h>
 #include "dnssecinfra.hh"
 
 using namespace Botan;
@@ -170,7 +171,11 @@ void GOSTDNSCryptoKeyEngine::fromPublicKeyString(const std::string& input)
   y=decode_le((const byte*)input.c_str() + input.length()/2, input.length()/2);
 
   auto params = getParams();
+#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(2,5,0)
   PointGFp point(params.get_curve(), x,y);
+#else
+  PointGFp point(params.point(x,y));
+#endif
   d_pubkey = std::make_shared<GOST_3410_PublicKey>(params, point);
   d_key.reset();
 }