Reformat certificate panel's signature and modulus fields

1 files changed, 36 insertions, 14 deletions

diff --git a/src/net/java/sip/communicator/plugin/desktoputil/X509CertificatePanel.java b/src/net/java/sip/communicator/plugin/desktoputil/X509CertificatePanel.java
index 037b177..5358030 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/X509CertificatePanel.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/X509CertificatePanel.java
@@ -292,7 +292,7 @@ public class X509CertificatePanel
             String sha1String = getThumbprint(certificate, "SHA1");
 
             addField(sb, "SHA256:", sha256String, 48);
-            addField(sb, "SHA1:", sha1String, 32);
+            addField(sb, "SHA1:", sha1String, 72);
         }
         catch (CertificateException e)
         {
@@ -319,13 +319,15 @@ public class X509CertificatePanel
         {
             RSAPublicKey key = (RSAPublicKey)certificate.getPublicKey();
 
-            addField(sb, R.getI18NString("service.gui.CERT_INFO_PUB_KEY"),
-                R.getI18NString(
-                    "service.gui.CERT_INFO_KEY_BYTES_PRINT",
+            addField(sb,
+                R.getI18NString("service.gui.CERT_INFO_PUB_KEY"),
+                R.getI18NString("service.gui.CERT_INFO_KEY_BITS_PRINT",
                     new String[]{
-                        String.valueOf(key.getModulus().toByteArray().length-1),
-                        key.getModulus().toString(16)
-                    }));
+                        String.valueOf(
+                            (key.getModulus().toByteArray().length-1)*8)
+                    }),
+                getHex(key.getModulus().toByteArray()),
+                48);
 
             addField(sb, R.getI18NString("service.gui.CERT_INFO_EXP"), 
                     key.getPublicExponent().toString());
@@ -349,9 +351,9 @@ public class X509CertificatePanel
                     "service.gui.CERT_INFO_KEY_BITS_PRINT",
                     new String[]{
                         String.valueOf(certificate.getSignature().length*8),
-                    }));
-        addField(sb, R.getI18NString("service.gui.CERT_INFO_SIGN"),
-            getHex(certificate.getSignature()), 48);
+                    }),
+                getHex(certificate.getSignature()),
+                48);
 
         sb.append("</table>\n");
     }
@@ -377,7 +379,7 @@ public class X509CertificatePanel
      */
     private void addField(StringBuilder sb, String field, String value)
     {
-        addField(sb, field, value, 0);
+        addField(sb, field, value, null, 0);
     }
 
     /**
@@ -390,9 +392,29 @@ public class X509CertificatePanel
     private void addField(StringBuilder sb, String field, String value,
         int wrap)
     {
+        addField(sb, field, value, null, wrap);
+    }
+
+    /**
+     * Add a field.
+     * @param sb StringBuilder to append to
+     * @param field name of the certificate field
+     * @param value to print (not wrapped)
+     * @param otherValue second line of value to print (wrapped)
+     * @param wrap force-wrap after number of characters
+     */
+    private void addField(StringBuilder sb, String field, String value,
+        String otherValue, int wrap)
+    {
         sb.append("<tr><td style='margin-left: 5pt; margin-right: 25pt;")
             .append("white-space: nowrap' valign='top'>")
-            .append(field).append("</td><td");
+            .append(field).append("</td><td><span");
+
+        if (otherValue != null)
+        {
+            sb.append('>').append(value).append("</span><br/><span");
+            value = otherValue;
+        }
 
         if (wrap > 0)
         {
@@ -401,7 +423,7 @@ public class X509CertificatePanel
             {
                 if (i % wrap == 0 && i > 0)
                 {
-                    sb.append("\n");
+                    sb.append("<br/>");
                 }
 
                 sb.append(value.charAt(i));
@@ -413,7 +435,7 @@ public class X509CertificatePanel
             sb.append(value);
         }
 
-        sb.append("</td></tr>\n");
+        sb.append("</span></td></tr>");
     }
 
     /**