diff options
Diffstat (limited to 'base')
9 files changed, 49 insertions, 45 deletions
diff --git a/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java b/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java index bb25974e9..ba87e1b8b 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java +++ b/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java @@ -40,7 +40,7 @@ public class KeyArchivalRequest extends ResourceMessage { private static final String DATA_TYPE = "dataType"; private static final String WRAPPED_PRIVATE_DATA = "wrappedPrivateData"; private static final String KEY_ALGORITHM = "keyAlgorithm"; - private static final String KEY_STRENGTH = "keyStrength"; + private static final String KEY_SIZE = "keySize"; public KeyArchivalRequest() { // required for JAXB (defaults) @@ -52,7 +52,7 @@ public class KeyArchivalRequest extends ResourceMessage { attributes.put(DATA_TYPE, form.getFirst(DATA_TYPE)); attributes.put(WRAPPED_PRIVATE_DATA, form.getFirst(WRAPPED_PRIVATE_DATA)); attributes.put(KEY_ALGORITHM, form.getFirst(KEY_ALGORITHM)); - attributes.put(KEY_STRENGTH, form.getFirst(KEY_STRENGTH)); + attributes.put(KEY_SIZE, form.getFirst(KEY_SIZE)); setClassName(getClass().getName()); } @@ -120,15 +120,15 @@ public class KeyArchivalRequest extends ResourceMessage { /** * @return the key strength (valid for symmetric keys) */ - public int getKeyStrength() { - return Integer.parseInt(attributes.get(KEY_STRENGTH)); + public int getKeySize() { + return Integer.parseInt(attributes.get(KEY_SIZE)); } /** - * @param strength the key strength to set (valid for symmetric keys) + * @param keySize the key strength to set (valid for symmetric keys) */ - public void setKeyStrength(int strength) { - attributes.put(KEY_STRENGTH, Integer.toString(strength)); + public void setKeySize(int keySize) { + attributes.put(KEY_SIZE, Integer.toString(keySize)); } public String toString() { @@ -154,7 +154,7 @@ public class KeyArchivalRequest extends ResourceMessage { before.setDataType(KeyRequestResource.SYMMETRIC_KEY_TYPE); before.setWrappedPrivateData("XXXXABCDEFXXX"); before.setKeyAlgorithm(KeyRequestResource.AES_ALGORITHM); - before.setKeyStrength(128); + before.setKeySize(128); String string = before.toString(); System.out.println(string); diff --git a/base/common/src/com/netscape/certsrv/key/KeyData.java b/base/common/src/com/netscape/certsrv/key/KeyData.java index 82e23ed9e..4fcb6b420 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyData.java +++ b/base/common/src/com/netscape/certsrv/key/KeyData.java @@ -46,7 +46,7 @@ public class KeyData { String algorithm; @XmlElement - Integer strength; + Integer size; public KeyData() { // required for JAXB (defaults) @@ -111,16 +111,16 @@ public class KeyData { } /** - * @return the strength + * @return the size */ - public Integer getStrength() { - return strength; + public Integer getSize() { + return size; } /** - * @param strength the strength to set + * @param size the size to set */ - public void setStrength(Integer strength) { - this.strength = strength; + public void setSize(Integer size) { + this.size = size; } } diff --git a/base/common/src/com/netscape/certsrv/key/KeyInfo.java b/base/common/src/com/netscape/certsrv/key/KeyInfo.java index 897fc3b1d..a4f4e62f3 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyInfo.java +++ b/base/common/src/com/netscape/certsrv/key/KeyInfo.java @@ -49,7 +49,7 @@ public class KeyInfo { protected String algorithm; @XmlElement - protected Integer strength; + protected Integer size; @XmlElement protected String ownerName; @@ -110,12 +110,12 @@ public class KeyInfo { this.algorithm = algorithm; } - public Integer getStrength() { - return strength; + public Integer getSize() { + return size; } - public void setStrength(Integer strength) { - this.strength = strength; + public void setSize(Integer size) { + this.size = size; } public String getOwnerName() { diff --git a/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java b/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java index c0445e455..7510b8c78 100644 --- a/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java +++ b/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java @@ -95,15 +95,15 @@ public class SymKeyGenerationRequest extends ResourceMessage { /** * @return the keySize */ - public int getKeySize() { - return Integer.parseInt(attributes.get(KEY_SIZE)); + public Integer getKeySize() { + return new Integer(attributes.get(KEY_SIZE)); } /** * @param keySize the key size to set */ - public void setKeySize(int keySize) { - attributes.put(KEY_SIZE, Integer.toString(keySize)); + public void setKeySize(Integer keySize) { + attributes.put(KEY_SIZE, keySize.toString()); } /** diff --git a/base/common/src/com/netscape/certsrv/kra/KRAClient.java b/base/common/src/com/netscape/certsrv/kra/KRAClient.java index 5473b9c73..4ff9a3115 100644 --- a/base/common/src/com/netscape/certsrv/kra/KRAClient.java +++ b/base/common/src/com/netscape/certsrv/kra/KRAClient.java @@ -78,7 +78,7 @@ public class KRAClient extends SubsystemClient { data.setClientId(clientId); data.setDataType(dataType); data.setKeyAlgorithm(algorithm); - data.setKeyStrength(strength); + data.setKeySize(strength); @SuppressWarnings("unchecked") ClientResponse<KeyRequestResponse> response = (ClientResponse<KeyRequestResponse>) @@ -176,7 +176,7 @@ public class KRAClient extends SubsystemClient { SymKeyGenerationRequest data = new SymKeyGenerationRequest(); data.setClientId(clientId); data.setKeyAlgorithm(keyAlgorithm); - data.setKeySize(keySize); + data.setKeySize(new Integer(keySize)); data.setUsages(usages); @SuppressWarnings("unchecked") diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java index 03e545f02..f205506aa 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyCLI.java @@ -66,7 +66,7 @@ public class KeyCLI extends CLI { if (info.getClientID() != null) System.out.println(" Client ID: "+info.getClientID()); if (info.getStatus() != null) System.out.println(" Status: "+info.getStatus()); if (info.getAlgorithm() != null) System.out.println(" Algorithm: "+info.getAlgorithm()); - if (info.getStrength() != null) System.out.println(" Size: "+info.getStrength()); + if (info.getSize() != null) System.out.println(" Size: "+info.getSize()); if (info.getOwnerName() != null) System.out.println(" Owner: "+info.getOwnerName()); } diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java index ce6a8fbf7..30ac1a650 100644 --- a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java +++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java @@ -725,7 +725,7 @@ public class DRMTest { log("ClientID: " + keyInfo.getClientID()); log("Key URL: " + keyInfo.getKeyURL()); log("Algorithm: " + keyInfo.getAlgorithm()); - log("Strength: " + keyInfo.getStrength()); + log("Strength: " + keyInfo.getSize()); } private static void log(String string) { 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); |