X-Git-Url: https://blacka.com/cgi-bin/gitweb.cgi?p=captive-validator.git;a=blobdiff_plain;f=src%2Fcom%2Fverisign%2Ftat%2Fdnssec%2FDnsSecVerifier.java;fp=src%2Fcom%2Fverisign%2Ftat%2Fdnssec%2FDnsSecVerifier.java;h=18441d8d2e67a5f461739c271bfc38d741a0fb42;hp=581d12e5ffae3bc3159dc4101839f6c1edadc3c6;hb=fcd4daa7fe43354ddb8c1bc7f92977fb2b3e3cb2;hpb=bc35e72aed44b6cf79766c7f4f27ea81390931df

diff --git a/src/com/verisign/tat/dnssec/DnsSecVerifier.java b/src/com/verisign/tat/dnssec/DnsSecVerifier.java
index 581d12e..18441d8 100644
--- a/src/com/verisign/tat/dnssec/DnsSecVerifier.java
+++ b/src/com/verisign/tat/dnssec/DnsSecVerifier.java
@@ -26,7 +26,7 @@ package com.verisign.tat.dnssec;
 import org.apache.log4j.Logger;
 
 import org.xbill.DNS.*;
-import org.xbill.DNS.security.*;
+import org.xbill.DNS.DNSSEC.DNSSECException;
 
 import java.io.*;
 
@@ -237,7 +237,7 @@ public class DnsSecVerifier {
         return SecurityStatus.SECURE;
     }
 
-    public PublicKey parseDNSKEY(DNSKEYRecord key) {
+    public PublicKey parseDNSKEY(DNSKEYRecord key) throws DNSSECException {
         AlgEntry ae = (AlgEntry) mAlgorithmMap.get(Integer.valueOf(key.getAlgorithm()));
 
         if (key.getAlgorithm() != ae.dnssecAlg) {
@@ -250,7 +250,7 @@ public class DnsSecVerifier {
                                    ae.dnssecAlg, key.getKey());
         }
 
-        return KEYConverter.parseRecord(key);
+        return key.getPublicKey();
     }
 
     /**
@@ -304,6 +304,8 @@ public class DnsSecVerifier {
             log.trace("Signature verified: " + sigrec);
 
             return SecurityStatus.SECURE;
+        } catch (DNSSECException e) {
+            log.error("DNSSEC key parsing error", e);
         } catch (IOException e) {
             log.error("I/O error", e);
         } catch (GeneralSecurityException e) {