diff options
Diffstat (limited to 'base/kra/src')
-rw-r--r-- | base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java index cec1ea434..a2c6fd9f5 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java @@ -50,16 +50,16 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; import org.mozilla.jss.pkix.primitive.PBEParameter; import org.mozilla.jss.util.Password; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.kra.EKRAException; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.request.IService; import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; import com.netscape.certsrv.security.IStorageKeyUnit; import com.netscape.certsrv.security.ITransportKeyUnit; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.dbs.keydb.IKeyRecord; -import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.cms.servlet.request.KeyRequestResource; import com.netscape.cmscore.dbs.KeyRecord; import com.netscape.cmsutil.util.Utils; @@ -301,9 +301,8 @@ public class SecurityDataRecoveryService implements IService { InvalidKeyException, InvalidAlgorithmParameterException, TokenException, CharConversionException { - if (!(keyGenAlg instanceof PBEAlgorithm)) { - throw new NoSuchAlgorithmException("Key generation algorithm" + - " is not a PBE algorithm"); + if (keyGenAlg == null) { + throw new NoSuchAlgorithmException("Key generation algorithm is NULL"); } PBEAlgorithm pbeAlg = keyGenAlg; |