From 9b92336bb63f7a4376e5a3915fc16026d3e4256a Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Mon, 10 Feb 2014 11:20:25 -0500
Subject: Fix minor issues from review.

1. Use size/keySize consistently, instead of strength.
2. Change to using Integer instead of int in SymKeyGenerationRequest.
3. Fix error message.
---
 .../netscape/cms/servlet/key/KeyRequestDAO.java    | 34 ++++++++++++----------
 .../com/netscape/cms/servlet/key/KeyService.java   |  4 +--
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'base/server/cms/src/com/netscape/cms/servlet/key')

diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
index 7a63b113d..b19f92b64 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
@@ -140,7 +140,7 @@ public class KeyRequestDAO extends CMSRequestDAO {
         String wrappedSecurityData = data.getWrappedPrivateData();
         String dataType = data.getDataType();
         String keyAlgorithm = data.getKeyAlgorithm();
-        int keyStrength = data.getKeyStrength();
+        int keyStrength = data.getKeySize();
 
         boolean keyExists = doesKeyExist(clientId, "active", uriInfo);
 
@@ -217,11 +217,11 @@ public class KeyRequestDAO extends CMSRequestDAO {
     public KeyRequestResponse submitRequest(SymKeyGenerationRequest data, UriInfo uriInfo) throws EBaseException {
         String clientId = data.getClientId();
         String algName = data.getKeyAlgorithm();
-        int size = data.getKeySize();
+        Integer keySize = data.getKeySize();
         List<String> usages = data.getUsages();
 
         if (StringUtils.isBlank(clientId)) {
-            throw new BadRequestException("Invalid key generation request. Missing clientId");
+            throw new BadRequestException("Invalid key generation request. Missing client ID");
         }
 
         boolean keyExists = doesKeyExist(clientId, "active", uriInfo);
@@ -229,29 +229,33 @@ public class KeyRequestDAO extends CMSRequestDAO {
             throw new BadRequestException("Can not archive already active existing key!");
         }
 
+        if (keySize == null) {
+            keySize = new Integer(0);
+        }
+
         if (StringUtils.isBlank(algName)) {
-            if (size != 0) {
+            if (keySize.intValue() != 0) {
                 throw new BadRequestException(
                         "Invalid request.  Must specify key algorithm if size is specified");
             }
             algName = KeyRequestResource.AES_ALGORITHM;
-            size = 128;
-        } else {
-            KeyGenAlgorithm alg = KeyRequestService.KEYGEN_ALGORITHMS.get(algName);
-            if (alg == null) {
-                throw new BadRequestException("Invalid Algorithm");
-            }
+            keySize = new Integer(128);
+        }
 
-            if (!alg.isValidStrength(size)) {
-                throw new BadRequestException("Invalid key size for this algorithm");
-            }
+        KeyGenAlgorithm alg = KeyRequestService.KEYGEN_ALGORITHMS.get(algName);
+        if (alg == null) {
+            throw new BadRequestException("Invalid Algorithm");
+        }
+
+        if (!alg.isValidStrength(keySize.intValue())) {
+            throw new BadRequestException("Invalid key size for this algorithm");
         }
 
         IRequest request = queue.newRequest(IRequest.SYMKEY_GENERATION_REQUEST);
 
         request.setExtData(IRequest.SYMKEY_GEN_ALGORITHM, algName);
-        request.setExtData(IRequest.SYMKEY_GEN_SIZE, size);
-        request.setExtData(IRequest.SECURITY_DATA_STRENGTH, size);
+        request.setExtData(IRequest.SYMKEY_GEN_SIZE, keySize);
+        request.setExtData(IRequest.SECURITY_DATA_STRENGTH, keySize);
         request.setExtData(IRequest.SECURITY_DATA_ALGORITHM, algName);
 
         request.setExtData(IRequest.SYMKEY_GEN_USAGES, StringUtils.join(usages, ","));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
index c91c3157a..20d263fff 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
@@ -253,7 +253,7 @@ public class KeyService extends PKIService implements KeyResource {
         }
 
         if (keySize != null) {
-            keyData.setStrength(keySize);
+            keyData.setSize(keySize);
         }
 
         kra.destroyVolatileRequest(request.getRequestId());
@@ -383,7 +383,7 @@ public class KeyService extends PKIService implements KeyResource {
         ret.setClientID(rec.getClientId());
         ret.setStatus(rec.getKeyStatus());
         ret.setAlgorithm(rec.getAlgorithm());
-        ret.setStrength(rec.getKeySize());
+        ret.setSize(rec.getKeySize());
         ret.setOwnerName(rec.getOwnerName());
 
         Path keyPath = KeyResource.class.getAnnotation(Path.class);
-- 
cgit