correcting JavaScript inability to handle big numbers

This patch corrects JavaScript inability to handle big numbers in key  key recovery process.

Bug: 955784.

5 files changed, 13 insertions, 8 deletions

diff --git a/base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template b/base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
index 0d2caf676..f6f2bdeb9 100644
--- a/base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
@@ -34,7 +34,8 @@ function toHex(number)
 
 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;
@@ -52,7 +53,7 @@ if (result.header.errorDetails != null) {
         document.writeln('</tr>');
 
         document.writeln('<tr>');
-        document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key Identifier:</font> <font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(result.header.serialNumber,8) + '</font></td>');
+        document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key Identifier:</font> <font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(result.header.serialNumberInHex,8) + '</font></td>');
         document.writeln('</tr>');
         document.write('</table>');
 
diff --git a/base/kra/shared/webapps/kra/agent/kra/finishRecovery.template b/base/kra/shared/webapps/kra/agent/kra/finishRecovery.template
index e73a26237..78553d2fa 100644
--- a/base/kra/shared/webapps/kra/agent/kra/finishRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/finishRecovery.template
@@ -34,7 +34,8 @@ function toHex(number)
 
 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;
@@ -52,7 +53,7 @@ if (result.header.errorDetails != null) {
         document.writeln('</tr>');
 
         document.writeln('<tr>');
-        document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key Identifier:</font> <font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(result.header.serialNumber,8) + '</font></td>');
+        document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key Identifier:</font> <font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(result.header.serialNumberInHex,8) + '</font></td>');
         document.writeln('</tr>');
         document.write('</table>');
 
diff --git a/base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template b/base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template
index 5a6a1114a..50196ce9f 100644
--- a/base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template
+++ b/base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template
@@ -35,7 +35,8 @@ function toHex(number)
 
 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;
@@ -53,7 +54,7 @@ if (result.header.errorDetails != null) {
         document.writeln('</tr>');
 
         document.writeln('<tr>');
-        document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key Identifier:</font> <font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(result.header.serialNumber,8) + '</font></td>');
+        document.write('<td><font size="-1" face="PrimaSans BT, Verdana, sans-serif">Key Identifier:</font> <font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(result.header.serialNumberInHex,8) + '</font></td>');
         document.writeln('</tr>');
         document.write('</table>');
 
diff --git a/base/kra/shared/webapps/kra/agent/kra/grantRecovery.template b/base/kra/shared/webapps/kra/agent/kra/grantRecovery.template
index 906da8338..b6668acc5 100644
--- a/base/kra/shared/webapps/kra/agent/kra/grantRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/grantRecovery.template
@@ -33,7 +33,8 @@ if (result.header.errorDetails != null) {
 	document.write("<p>");
 	document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=-1>');
 	document.write('Recovery of key with key identifier ' + 
-		toHex(result.header.serialNumber) + 
+                ((typeof(result.header.serialNumberInHex) != "undefined")?
+                 result.header.serialNumberInHex: toHex(result.header.serialNumber)) +
 		' has been granted by ' + result.header.agentID);
 	document.write('</font>');
 }
diff --git a/base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template b/base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template
index a1209f32b..027c31887 100644
--- a/base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template
+++ b/base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template
@@ -35,7 +35,8 @@ if (result.header.errorDetails != null) {
 	document.write("<p>");
 	document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=-1>');
 	document.write('Recovery request for Key with key identifier ' + 
-		toHex(result.header.serialNumber) + 
+                ((typeof(result.header.serialNumberInHex) != "undefined")?
+                 result.header.serialNumberInHex: toHex(result.header.serialNumber)) +
 		' has been submitted.\n' +
 		'Waiting for recovery agents\' approval...');