davidb/jdnssec-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

up the version; fix minor issues

Browse Source 
git-svn-id: https://svn.verisignlabs.com/jdnssec/tools/trunk@36 4cbd57fe-54e5-0310-bd9a-f30fe5ea5e6e
This commit is contained in:
David Blacka
2005-10-27 22:42:57 +00:00
parent 04ab26f434
commit 1f08b8abb8
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/verisignlabs/dnssec/cl/SignZone.java
View File

@@ -132,6 +132,12 @@ public class SignZone
if (cli.hasOption('3')) useNsec3 = true;
if (cli.hasOption('O')) useOptIn = true;
if (useOptIn && ! useNsec3)
{
System.err.println("OptIn not supported without NSEC3 -- ignored.");
useOptIn = false;
}
if (cli.hasOption('F')) fullySignKeyset = true;
if ((optstr = cli.getOptionValue('d')) != null)
@@ -184,11 +190,11 @@ public class SignZone
includeNames = getNameList(includeNamesFile);
}
if ((optstr = cli.getOptionValue("salt")) != null)
if ((optstr = cli.getOptionValue('S')) != null)
{
salt = base16.fromString(optstr);
}
if ((optstr = cli.getOptionValue("random-salt")) != null)
if ((optstr = cli.getOptionValue('R')) != null)
{
int length = parseInt(optstr, 0);
if (length > 0 && length <= 255)
@@ -269,10 +275,10 @@ public class SignZone
opts.addOption(OptionBuilder.hasArg().withLongOpt("salt")
.withArgName("hex value").withDescription("supply a salt value.")
.create());
.create('S'));
opts.addOption(OptionBuilder.hasArg().withLongOpt("random-salt")
.withArgName("length").withDescription("generate a random salt.")
.create());
.create('R'));
opts.addOption(OptionBuilder.hasArg().withLongOpt("iterations")
.withArgName("value")
.withDescription("use this value for the iterations in NSEC3.")

4
src/com/verisignlabs/dnssec/security/SignUtils.java
View File

@@ -470,7 +470,7 @@ public class SignUtils
Record r = (Record) o;
// First record
if (rrset.getName() == null)
if (rrset.size() == 0)
{
rrset.addRR(r);
continue;
@@ -828,7 +828,7 @@ public class SignUtils
for (int i = 1; i < ldiff; i++)
{
Name n = new Name(node.name, i);
log.info("Generating ENT NSEC3 for " + n);
log.fine("Generating ENT NSEC3 for " + n);
ProtoNSEC3 nsec3 = generateNSEC3(n,
zonename,
node.ttl,