diff options
Diffstat (limited to 'pki/base/kra')
3 files changed, 3 insertions, 31 deletions
diff --git a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java index 713e276d7..8f9a08b29 100644 --- a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java +++ b/pki/base/kra/src/com/netscape/kra/EnrollmentService.java @@ -352,19 +352,6 @@ public class EnrollmentService implements IService { privateKeyData, owner, publicKey.getAlgorithmId().getOID().toString(), agentId); - if (rec == null) { - - auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST, - auditSubjectID, - ILogger.FAILURE, - auditRequesterID, - auditArchiveID); - - audit(auditMessage); - throw new EKRAException(CMS.getUserMessage("CMS_KRA_INVALID_KEYRECORD")); - } - // we deal with RSA key only try { RSAPublicKey rsaPublicKey = new RSAPublicKey(publicKeyData); @@ -787,7 +774,7 @@ public class EnrollmentService implements IService { } } - if (key != null) { + { key = key.trim(); if (key.equals("")) { @@ -795,8 +782,6 @@ public class EnrollmentService implements IService { } else { return key; } - } else { - return ILogger.SIGNED_AUDIT_EMPTY_VALUE; } } /** diff --git a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index f055442bc..74bb69543 100644 --- a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -1688,15 +1688,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove } } - if (key != null) { - key = key.trim(); - - if (key.equals("")) { - return ILogger.SIGNED_AUDIT_EMPTY_VALUE; - } else { - return key; - } - } else { + { return ILogger.SIGNED_AUDIT_EMPTY_VALUE; } } diff --git a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java index 31b613249..c69ab8c16 100644 --- a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java +++ b/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java @@ -548,12 +548,7 @@ public class NetkeyKeygenService implements IService { keypair.getPublic().getAlgorithm(), agentId); - if (rec == null) { - request.setExtData(IRequest.RESULT, Integer.valueOf(11)); - CMS.debug("NetkeyKeygenService: privatekey recording failed"); - return false; - } else - CMS.debug("NetkeyKeygenService: got key record"); + CMS.debug("NetkeyKeygenService: got key record"); // we deal with RSA key only try { |