up the version; fix minor issues

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

13
README
View File

@ -11,7 +11,8 @@ are part of BIND 9.
These tools depend upon DNSjava (http://www.xbill.org/dnsjava), the
Jakarta Commons CLI and Logging libraries (http://jakarta.apache.org),
and Sun's Java Cryptography extensions. A copy of each of these
libraries is included in the distribution.
libraries is included in the distribution. Currently, these tools use
a custom version of the DNSjava library (for NSEC3 support)
See the "licenses" directory for the licensing information of this
package and the other packages that are distributed with it.
@ -25,7 +26,7 @@ Getting started:
2. run the various tools from their unpacked location:
% cd java-dnssec-tools-x.x.x
% ./bin/signZone.sh -h
% ./bin/jdnssec-signzone -h
Building from source:
@ -37,12 +38,16 @@ that the binary distribution was unpacked.
2. edit the build.properties file to suit your environment,
particularly the use of the jikes compiler.
2. run Ant (see http://jakara.apache.org for information about the Ant
3. run Ant (see http://jakara.apache.org for information about the Ant
build tool).
% ant
---
4. You can build the distribution tarballs with 'ant dist'. You can
run the tools directly from the build area by using the
./bin/_jdnssec_* wrappers.
---
Questions or comments may be directed to the author
(mailto:davidb@verisignlabs.com) or sent to the

View File

@ -1,3 +1,2 @@
version=0.3.0
tagversion=0_3_0
version=0.4.0

View File

@ -1,3 +1,3 @@
build.compiler=jikes
#build.compiler=jikes
#build.compiler=modern
build.deprecation=true

View File

@ -156,7 +156,7 @@
<target name="dist" depends="sectools-dist">
<echo message="do not forget to tag the release:" />
<echo message=" cvs tag V_${tagversion}" />
<echo message=" svn-tag ${version}" />
</target>
<target name="usage">

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.")

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,