diff options
| author | Ade Lee <alee@redhat.com> | 2017-03-23 00:20:32 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2017-03-23 16:16:08 -0400 |
| commit | 5b7ce994b8698dca62c23e653b7a1cfeebf959e4 (patch) | |
| tree | f7673ab05610d8cc8444d4482a95b1949c9eb985 /base/server | |
| parent | 58bfe7d510126609969703325d7655175be5da62 (diff) | |
Refactor code that creates PKIArchiveOptions objects
* Refactor code in CryptoUtil to parametrize the algorithms used.
* Moved WrappingParams to utils jar to allow correct compilation.
* Removed code that created a PKIArchiveOptions structure from
CRMFPopClient and replaced with calls to CryptoUtil methods.
Note that the algorithms have been left as DES3. They will be
changed to AES in the next patch.
* Converted code in AuthorityKeyExportCLI to use the new methods
in CryptoUtil.
* Removed DRMTest this code is no longer maintained or used.
Change-Id: I8f625f0310877dca68f6a01285b6ff4e27e7f34a
Diffstat (limited to 'base/server')
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 3 | ||||
| -rw-r--r-- | base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index ed2423ff1..ee1984bc9 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -2446,8 +2446,7 @@ public class ConfigurationUtils { } public static void createRSAKeyPair(String token, int keysize, IConfigStore config, String ct) - throws NoSuchAlgorithmException, NoSuchTokenException, TokenException, - CryptoManager.NotInitializedException, EPropertyNotFound, EBaseException { + throws Exception { /* generate key pair */ KeyPair pair = null; do { diff --git a/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java index 6e594f849..97f494211 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java +++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java @@ -33,9 +33,10 @@ import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.dbs.IDBObj; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.KeyState; -import com.netscape.certsrv.security.WrappingParams; import com.netscape.cms.servlet.key.KeyRecordParser; +import netscape.security.util.WrappingParams; + /** * A class represents a Key record. It maintains the key * life cycle as well as other information about an |