From 03737a1efdedc037edcb611168c4dd4fbd42e0d7 Mon Sep 17 00:00:00 2001 From: David Blacka Date: Wed, 2 Feb 2011 19:36:40 +0000 Subject: [PATCH] Handle the new bind 9.7 private key files (hopefully). git-svn-id: https://svn.verisignlabs.com/jdnssec/tools/trunk@227 4cbd57fe-54e5-0310-bd9a-f30fe5ea5e6e --- ChangeLog | 6 ++++++ src/com/verisignlabs/dnssec/security/DnsKeyConverter.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8dc2bca..17d2904 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-02-02 Blacka + + * DnsKeyConverter: support the new BIND 9.7 private key format, + which only entails recognizing the new version string, since the + new format is a superset of the old format. + 2011-01-11 Blacka * jdnssec-zoneformat: add a -m option for formatting as diff --git a/src/com/verisignlabs/dnssec/security/DnsKeyConverter.java b/src/com/verisignlabs/dnssec/security/DnsKeyConverter.java index 9db0f70..01f7efe 100644 --- a/src/com/verisignlabs/dnssec/security/DnsKeyConverter.java +++ b/src/com/verisignlabs/dnssec/security/DnsKeyConverter.java @@ -172,7 +172,7 @@ public class DnsKeyConverter if (line.startsWith("Private-key-format: ")) { - if (!val.equals("v1.2")) + if (!val.equals("v1.2") && !val.equals("v1.3")) { throw new IOException("unsupported private key format: " + val); }