Index: pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
===================================================================
--- pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java (revision 2533)
+++ pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java (working copy)
@@ -50,6 +50,7 @@
public final static String OUT_STATE = "state";
public final static String OUT_OWNER_NAME = "ownerName";
public final static String OUT_SERIALNO = "serialNumber";
+ public final static String OUT_SERIALNO_IN_HEX = "serialNumberInHex";
public final static String OUT_KEY_ALGORITHM = "keyAlgorithm";
public final static String OUT_PUBLIC_KEY = "publicKey";
public final static String OUT_KEY_LEN = "keyLength";
@@ -73,6 +74,8 @@
rec.getOwnerName());
rarg.addBigIntegerValue(OUT_SERIALNO,
rec.getSerialNumber(), 10);
+ rarg.addBigIntegerValue(OUT_SERIALNO_IN_HEX,
+ rec.getSerialNumber(), 16);
rarg.addStringValue(OUT_KEY_ALGORITHM,
rec.getAlgorithm());
// Possible Enhancement: sun's BASE64Encode is not
Index: pki/redhat/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
===================================================================
--- pki/redhat/kra-ui/shared/webapps/kra/agent/kra/srchKey.template (revision 16063)
+++ pki/redhat/kra-ui/shared/webapps/kra/agent/kra/srchKey.template (working copy)
@@ -48,7 +48,8 @@
function renderHexNumber(number,width)
{
- var num = toHex(number);
+ //var num = toHex(number);
+ var num = number;
while (num.length < width)
num = "0"+num;
return "0x"+num;
@@ -107,8 +108,8 @@
document.write('');
document.write('
');
- // document.write('' + renderHexNumber(rec.serialNumber,8) + ' | ');
- document.write('' + renderHexNumber(rec.serialNumber,8) + ' | ');
+ // document.write('' + renderHexNumber(rec.serialNumberInHex,8) + ' | ');
+ document.write('' + renderHexNumber(rec.serialNumberInHex,8) + ' | ');
document.write('' + rec.state + ' | ');
document.write('' + renderDateFromSecs(rec.archivedOn) + ' | ');
document.write('' + renderDateFromSecs(rec.archivedOn) + ' | ');
Index: pki/redhat/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
===================================================================
--- pki/redhat/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template (revision 16063)
+++ pki/redhat/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template (working copy)
@@ -47,7 +47,8 @@
function renderHexNumber(number,width)
{
- var num = toHex(number);
+ //var num = toHex(number);
+ var num = number;
while (num.length < width)
num = "0"+num;
return "0x"+num;
@@ -120,8 +121,8 @@
document.write('
');
document.write('');
- // document.write('' + renderHexNumber(rec.serialNumber,8) + ' | ');
- document.write('' + renderHexNumber(rec.serialNumber,8) + ' | ');
+ // document.write('' + renderHexNumber(rec.serialNumberInHex,8) + ' | ');
+ document.write('' + renderHexNumber(rec.serialNumberInHex,8) + ' | ');
document.write('' + rec.state + ' | ');
document.write('' + renderDateFromSecs(rec.archivedOn) + ' | ');
document.write('' + renderDateFromSecs(rec.archivedOn) + ' | ');
Index: pki/redhat/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
===================================================================
--- pki/redhat/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template (revision 16063)
+++ pki/redhat/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template (working copy)
@@ -31,7 +31,8 @@
function renderHexNumber(number,width)
{
- var num = toHex(number);
+ //var num = toHex(number);
+ var num = number;
while (num.length < width)
num = "0"+num;
return "0x"+num;
@@ -57,7 +58,7 @@
'?op=displayBySerial&serialNumber=' + result.header.serialNumber + '"' +
'onMouseOver=" return helpstatus(\'Click to redisplay this ' +
'request \')" onMouseOut="return helpstatus(\'\')">' +
- renderHexNumber(result.header.serialNumber,8) +
+ renderHexNumber(result.header.serialNumberInHex,8) +
'');
document.writeln('');
Index: pki/redhat/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
===================================================================
--- pki/redhat/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template (revision 16063)
+++ pki/redhat/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template (working copy)
@@ -43,7 +43,8 @@
function renderHexNumber(number,width)
{
- var num = toHex(number);
+ //var num = toHex(number);
+ var num = number;
while (num.length < width)
num = "0"+num;
return "0x"+num;
@@ -97,7 +98,7 @@
'op=displayBySerial&serialNumber=' + result.header.serialNumber + '"' +
'onMouseOver=" return helpstatus(\'Click to redisplay this ' +
'request \')" onMouseOut="return helpstatus(\'\')">' +
- renderHexNumber(result.header.serialNumber,8) +
+ renderHexNumber(result.header.serialNumberInHex,8) +
'');
document.writeln('');