diff options
Diffstat (limited to 'base/common/src/com/netscape')
4 files changed, 31 insertions, 6 deletions
diff --git a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java index f795ff9a6..f86d64b12 100644 --- a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java +++ b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java @@ -87,6 +87,13 @@ public interface IKeyRecord { public Integer getKeySize() throws EBaseException; /** + * Retrieves meta info. + * + * @return MetaInfo + */ + public MetaInfo getMetaInfo(); + + /** * Retrieves archiver identifier. * * @return archiver uid diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java index 810e89340..0a72a8ebd 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java @@ -500,14 +500,14 @@ public class SizePanel extends WizardPanelBase { CMS.debug("SizePanel: createECCKeypair: sslserver cert for ECDH. Make sure server.xml is set properly with -TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,+TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"); pair = CryptoUtil.generateECCKeyPair(token, curveName, null, - ECDH_usages_mask); + ECDH_usages_mask, false, -1, -1); } else { if (ct.equals("sslserver")) { CMS.debug("SizePanel: createECCKeypair: sslserver cert for ECDHE. Make sure server.xml is set properly with +TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,-TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"); } pair = CryptoUtil.generateECCKeyPair(token, curveName, null, - usages_mask); + usages_mask, false, -1, -1); } // XXX - store curve , w diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java index 43e772c46..7dfc80615 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -20,6 +20,7 @@ package com.netscape.cms.servlet.key; import com.netscape.cms.servlet.common.*; import com.netscape.cms.servlet.base.*; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; import java.io.*; import java.util.*; @@ -52,6 +53,7 @@ public class KeyRecordParser { public final static String OUT_KEY_ALGORITHM = "keyAlgorithm"; public final static String OUT_PUBLIC_KEY = "publicKey"; public final static String OUT_KEY_LEN = "keyLength"; + public final static String OUT_KEY_EC_CURVE = "EllipticCurve"; public final static String OUT_ARCHIVED_BY = "archivedBy"; public final static String OUT_ARCHIVED_ON = "archivedOn"; public final static String OUT_RECOVERED_BY = "recoveredBy"; @@ -86,6 +88,16 @@ public class KeyRecordParser { } else { rarg.addIntegerValue(OUT_KEY_LEN, keySize.intValue()); } + + // handles EC + MetaInfo metaInfo = rec.getMetaInfo(); + if (metaInfo != null) { + String curve = (String)metaInfo.get(OUT_KEY_EC_CURVE); + if (curve != null) { + rarg.addStringValue(OUT_KEY_EC_CURVE, curve); + } + } + rarg.addStringValue(OUT_ARCHIVED_BY, rec.getArchivedBy()); rarg.addLongValue(OUT_ARCHIVED_ON, diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java index 7b6fcdb8d..43eb7ce4e 100644 --- a/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java +++ b/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java @@ -265,6 +265,16 @@ public class KeyRecord implements IDBObj, IKeyRecord { } /** + * Retrieves the metaInfo. + * <P> + * + * @return metaInfo + */ + public MetaInfo getMetaInfo() { + return mMetaInfo; + } + + /** * Sets key size. * <P> */ @@ -327,10 +337,6 @@ public class KeyRecord implements IDBObj, IKeyRecord { return mAlgorithm; } - public MetaInfo getMetaInfo() { - return mMetaInfo; - } - /** * Retrieves the creation time of this record. */ |