diff options
Diffstat (limited to 'dogtag')
7 files changed, 34 insertions, 18 deletions
diff --git a/dogtag/kra-ui/dogtag-pki-kra-ui.spec b/dogtag/kra-ui/dogtag-pki-kra-ui.spec index 274d1ec76..e60654bc4 100644 --- a/dogtag/kra-ui/dogtag-pki-kra-ui.spec +++ b/dogtag/kra-ui/dogtag-pki-kra-ui.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-kra-ui Version: 9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Data Recovery Authority User Interface URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -57,5 +57,8 @@ rm -rf %{buildroot} %{_datadir}/pki/ %changelog +* Tue Apr 10 2012 Christina Fu <cfu@redhat.com> 9.0.0-2 +- Bugzilla bug 745278 - [RFE] ECC encryption keys cannot be archived + * Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1 - Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0. 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('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.keyAlgorithm + '</font></td>'); document.writeln('</tr>'); - document.writeln('<tr>'); - document.write('<td align=right><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key length:</font></td>'); - document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.keyLength + '</font></td>'); - document.writeln('</tr>'); - + if ((result.header.EllipticCurve != null)) { + document.writeln('<tr>'); + document.write('<td align=right><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Elliptic Key Curve:</font></td>'); + document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.EllipticCurve + '</font></td>'); + document.writeln('</tr>'); + } else { + document.writeln('<tr>'); + document.write('<td align=right><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key length:</font></td>'); + document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.keyLength + '</font></td>'); + document.writeln('</tr>'); + } document.write("</table>"); document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD> </TD></TR></TABLE>'); 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('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.keyAlgorithm + '</font></td>'); document.writeln('</tr>'); - document.writeln('<tr>'); - document.write('<td align=right><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key length:</font></td>'); - document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.keyLength + '</font></td>'); - document.writeln('</tr>'); + if (result.header.EllipticCurve != null) { + document.writeln('<tr>'); + document.write('<td align=right><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Elliptic Key Curve:</font></td>'); + document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.EllipticCurve + '</font></td>'); + document.writeln('</tr>'); + } else { + document.writeln('<tr>'); + document.write('<td align=right><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key length:</font></td>'); + document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + result.header.keyLength + '</font></td>'); + document.writeln('</tr>'); + } document.writeln('<tr>'); document.write('<td align=right><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Async Recovery:</font></td>'); 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..9396b9840 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('</td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimasSans BT, Verdana, sans-serif">' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ '</font></td>'); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ '</font></td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + rec.ownerName + '</font></td>'); document.write('</tr>'); 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..ff5a850a9 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('</td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimasSans BT, Verdana, sans-serif">' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ '</font></td>'); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ '</font></td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + rec.ownerName + '</font></td>'); document.write('</tr>'); 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..d2b42f01f 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('</td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimasSans BT, Verdana, sans-serif">' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ '</font></td>'); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ '</font></td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + rec.ownerName + '</font></td>'); document.write('</tr>'); 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..761688213 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('</td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimasSans BT, Verdana, sans-serif">' + - renderOidName(rec.keyAlgorithm) + (rec.keyLength != null ? - " with "+ rec.keyLength + "-bit key" : "")+ '</font></td>'); + renderOidName(rec.keyAlgorithm) + (((rec.keyLength != null) && (rec.keyLength >= 0)) ? + " with "+ rec.keyLength + "-bit key" : ((rec.EllipticCurve != null)? " with " + rec.EllipticCurve:""))+ '</font></td>'); document.write('<td align=left colspan=2><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + rec.ownerName + '</font></td>'); document.write('</tr>'); |