Bugzilla Bug #971561 - DRM - server-side key generation causes

NullPointerException if a parameter is not supplied by the caller (TPS) - cfu

1 files changed, 5 insertions, 4 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
index 52f58afb2..3d0ad4c62 100644
--- a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
@@ -152,15 +152,16 @@ public class GenerateKeyPairServlet extends CMSServlet {
             missingParam = true;
         }
 
+        // if not specified, default to RSA
+        if ((rKeytype == null) || (rKeytype.equals(""))) {
+            rKeytype = "RSA";
+        }
+
         // keysize is for non-EC (EC uses keycurve)
         if (!rKeytype.equals("EC") && ((rKeysize == null) || (rKeysize.equals("")))) {
             rKeysize = "1024"; // default to 1024
         }
 
-        // if not specified, default to RSA
-        if ((rKeytype == null) || (rKeytype.equals(""))) {
-            rKeytype = "RSA";
-        }
         if (rKeytype.equals("EC")) {
             if ((rKeycurve == null) || (rKeycurve.equals(""))) {
                 rKeycurve = "nistp256";