From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 14 Jan 2022 10:48:33 +0000 (+0100)
Subject: Merge pull request #11100 from omoerbeek/zonemd
X-Git-Tag: auth-4.7.0-alpha1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2510786c785cbd39751f6554d320a00bd680dd7c;p=thirdparty%2Fpdns.git

Merge pull request #11100 from omoerbeek/zonemd

First part of ZONEMD support
---

2510786c785cbd39751f6554d320a00bd680dd7c
diff --cc pdns/pdnsutil.cc
index 0605bd387c,25fb93c433..8b419d236f
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@@ -1357,8 -1358,40 +1358,40 @@@ static int xcryptIP(const std::string& 
    cout<<ret.toString()<<endl;
    return EXIT_SUCCESS;
  }
 -
 +#endif /* HAVE_IPCIPHER */
  
+ static int zonemdVerifyFile(const DNSName& zone, const string& fname) {
+   ZoneParserTNG zpt(fname, zone);
+   zpt.setMaxGenerateSteps(::arg().asNum("max-generate-steps"));
+ 
+   bool validationDone, validationOK;
+ 
+   try {
+     pdns::zonemdVerify(zone, zpt, validationDone, validationOK);
+   }
+   catch (const PDNSException& ex) {
+     cerr << "zonemd-verify-file: " << ex.reason << endl;
+     return EXIT_FAILURE;
+   }
+   catch (const std::exception& ex) {
+     cerr << "zonemd-verify-file: " << ex.what() << endl;
+     return EXIT_FAILURE;
+   }
+ 
+   if (validationDone) {
+     if (validationOK) {
+       cout << "zonemd-verify-file: Verification of ZONEMD record succeeded" << endl;
+       return EXIT_SUCCESS;
+     } else {
+       cerr << "zonemd-verify-file: Verification of ZONEMD record(s) failed" << endl;
+     }
+   }
+   else {
+     cerr << "zonemd-verify-file: No suitable ZONEMD record found to verify against" << endl;
+   }
+   return EXIT_FAILURE;
+ }
+ 
  static int loadZone(const DNSName& zone, const string& fname) {
    UeberBackend B;
    DomainInfo di;