From c95e1296ca0d47dcf841d35f972993ff9683b07f Mon Sep 17 00:00:00 2001
From: David Blacka <davidb@verisign.com>
Date: Wed, 24 May 2006 19:48:48 +0000
Subject: [PATCH] add some error checking for NSEC3 parameters

git-svn-id: https://svn.verisignlabs.com/jdnssec/tools/trunk@72 4cbd57fe-54e5-0310-bd9a-f30fe5ea5e6e
---
 src/com/verisignlabs/dnssec/cl/SignZone.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/verisignlabs/dnssec/cl/SignZone.java b/src/com/verisignlabs/dnssec/cl/SignZone.java
index 8d0c674..0f59a5c 100644
--- a/src/com/verisignlabs/dnssec/cl/SignZone.java
+++ b/src/com/verisignlabs/dnssec/cl/SignZone.java
@@ -266,6 +266,11 @@ public class SignZone
       if ((optstr = cli.getOptionValue('S')) != null)
       {
         salt = base16.fromString(optstr);
+        if (salt == null && !optstr.equals("-"))
+        {
+          System.err.println("error: salt is not valid hexidecimal.");
+          usage();
+        }
       }
 
       if ((optstr = cli.getOptionValue('R')) != null)
@@ -282,6 +287,11 @@ public class SignZone
       if ((optstr = cli.getOptionValue("iterations")) != null)
       {
         iterations = parseInt(optstr, iterations);
+        if (iterations < 0 || iterations > 8388607)
+        {
+          System.err.println("error: iterations value is invalid");
+          usage();
+        }
       }
 
       String[] files = cli.getArgs();
@@ -341,7 +351,6 @@ public class SignZone
       out.flush();
       System.exit(64);
     }
-
   }
 
   /**