diff options
Diffstat (limited to 'base/common/src/com/netscape/cms')
| -rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java | 4 | ||||
| -rw-r--r-- | base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java | 12 |
2 files changed, 14 insertions, 2 deletions
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 678145a92..bd557fa7a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java @@ -510,14 +510,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 aeee624c0..ed770ea91 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -23,6 +23,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.dbs.keydb.IKeyRecord; /** @@ -38,6 +39,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"; @@ -71,6 +73,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, |