1 files changed, 12 insertions, 0 deletions
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,