From 59fc17a56117020dc3ce6ca42993f5eedbb6ae09 Mon Sep 17 00:00:00 2001 From: Christina Fu Date: Thu, 5 Apr 2012 17:39:51 -0700 Subject: pki-ui changes for Bug 745278 - [RFE] ECC encryption keys cannot be archived --- .../webapps/kra/agent/kra/displayBySerial.template | 16 +++++++++++----- .../kra/agent/kra/displayBySerialForRecovery.template | 15 +++++++++++---- .../shared/webapps/kra/agent/kra/queryKey.template | 4 ++-- .../webapps/kra/agent/kra/queryKeyForRecovery.template | 4 ++-- .../kra-ui/shared/webapps/kra/agent/kra/srchKey.template | 4 ++-- .../webapps/kra/agent/kra/srchKeyForRecovery.template | 4 ++-- 6 files changed, 30 insertions(+), 17 deletions(-) (limited to 'dogtag') diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template index a88599ede..8b6795365 100644 --- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template +++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template @@ -100,11 +100,17 @@ if (result.header.errorDetails != null) { document.write('' + result.header.keyAlgorithm + ''); document.writeln(''); - document.writeln(''); - document.write('Key length:'); - document.write('' + result.header.keyLength + ''); - document.writeln(''); - + if ((result.header.EllipticCurve != null)) { + document.writeln(''); + document.write('Elliptic Key Curve:'); + document.write('' + result.header.EllipticCurve + ''); + document.writeln(''); + } else { + document.writeln(''); + document.write('Key length:'); + document.write('' + result.header.keyLength + ''); + document.writeln(''); + } document.write(""); document.writeln('
 
'); diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template index 717d1d7d6..b1c931b12 100644 --- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template +++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template @@ -143,10 +143,17 @@ if (result.header.errorDetails != null) { document.write('' + result.header.keyAlgorithm + ''); document.writeln(''); - document.writeln(''); - document.write('Key length:'); - document.write('' + result.header.keyLength + ''); - document.writeln(''); + if (result.header.EllipticCurve != null) { + document.writeln(''); + document.write('Elliptic Key Curve:'); + document.write('' + result.header.EllipticCurve + ''); + document.writeln(''); + } else { + document.writeln(''); + document.write('Key length:'); + document.write('' + result.header.keyLength + ''); + document.writeln(''); + } document.writeln(''); document.write('Async Recovery:'); diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template index 0bea5f140..f7560a193 100644 --- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template +++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template @@ -129,8 +129,8 @@ function displayKeyRecord(rec) document.write(renderDetailsButton(rec.serialNumber)); document.write(''); document.write('' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ ''); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ ''); document.write('' + rec.ownerName + ''); document.write(''); diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template index 09e873377..590584dd4 100644 --- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template +++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template @@ -141,8 +141,8 @@ function displayKeyRecord(rec) document.write(renderDetailsButton(rec.serialNumber,result.header.publicKeyData)); document.write(''); document.write('' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ ''); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ ''); document.write('' + rec.ownerName + ''); document.write(''); diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template index a06999996..bc64ea445 100644 --- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template +++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template @@ -129,8 +129,8 @@ function displayKeyRecord(rec) document.write(renderDetailsButton(rec.serialNumber)); document.write(''); document.write('' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ ''); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ ''); document.write('' + rec.ownerName + ''); document.write(''); diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template index 4c5387c32..2c421a5e7 100644 --- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template +++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template @@ -142,8 +142,8 @@ function displayKeyRecord(rec) document.write(renderDetailsButton(rec.serialNumber,result.header.publicKeyData)); document.write(''); document.write('' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ ''); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ ''); document.write('' + rec.ownerName + ''); document.write(''); -- cgit