diff options
Diffstat (limited to 'base/kra/src')
-rw-r--r-- | base/kra/src/CMakeLists.txt | 9 | ||||
-rw-r--r-- | base/kra/src/com/netscape/kra/SymKeyGenService.java | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt index 99088ce06..ccbc6a6c3 100644 --- a/base/kra/src/CMakeLists.txt +++ b/base/kra/src/CMakeLists.txt @@ -75,6 +75,13 @@ find_file(SYMKEY_JAR ${JAVA_LIB_INSTALL_DIR} ) +find_file(COMMONS_LANG_JAR + NAMES + commons-lang.jar + PATHS + /usr/share/java +) + # build pki-kra javac(pki-kra-classes @@ -84,7 +91,7 @@ javac(pki-kra-classes ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} ${LDAPJDK_JAR} ${JAXRS_API_JAR} - ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} + ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_LANG_JAR} ${SYMKEY_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS diff --git a/base/kra/src/com/netscape/kra/SymKeyGenService.java b/base/kra/src/com/netscape/kra/SymKeyGenService.java index 99c57b8d9..d1e60fa70 100644 --- a/base/kra/src/com/netscape/kra/SymKeyGenService.java +++ b/base/kra/src/com/netscape/kra/SymKeyGenService.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.commons.lang.StringUtils; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.KeyGenAlgorithm; import org.mozilla.jss.crypto.KeyGenerator; @@ -92,7 +93,8 @@ public class SymKeyGenService implements IService { String algorithm = request.getExtDataInString(IRequest.SYMKEY_GEN_ALGORITHM); String usageStr = request.getExtDataInString(IRequest.SYMKEY_GEN_USAGES); - List<String> usages = new ArrayList<String>(Arrays.asList(usageStr.split(","))); + List<String> usages = new ArrayList<String>( + Arrays.asList(StringUtils.split(usageStr, ","))); String keySizeStr = request.getExtDataInString(IRequest.SYMKEY_GEN_SIZE); int keySize = Integer.parseInt(keySizeStr); |