diff options
author | Jose <jose@zeroc.com> | 2020-12-30 21:10:25 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2020-12-30 21:10:25 +0100 |
commit | 0f564c49225bc8b9c60681ac1049fb8e5ba31b77 (patch) | |
tree | 8418de9e6ce92e8fa5d23dd78b728d6560cb232a /java | |
parent | Update CodeQL workflow build commands (diff) | |
download | ice-0f564c49225bc8b9c60681ac1049fb8e5ba31b77.tar.bz2 ice-0f564c49225bc8b9c60681ac1049fb8e5ba31b77.tar.xz ice-0f564c49225bc8b9c60681ac1049fb8e5ba31b77.zip |
Replace SHA1/MD5 fingerprint with sha256 fingerprint
Diffstat (limited to 'java')
-rw-r--r-- | java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java index a69d7f9fd38..5160f0fd966 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java @@ -4398,12 +4398,12 @@ public class SessionKeeper builder.border(Borders.DIALOG); builder.rowGroupingEnabled(true); builder.lineGapSize(LayoutStyle.getCurrent().getLinePad()); - builder.addSeparator("Fingerprints"); + builder.addSeparator("Fingerprint"); builder.nextLine(); - String sha1Fingerprint = ""; + String sha256Fingerprint = ""; { - MessageDigest md = MessageDigest.getInstance("SHA-1"); + MessageDigest md = MessageDigest.getInstance("SHA-256"); byte[] der = cert.getEncoded(); md.update(der); byte[] digest = md.digest(); @@ -4427,42 +4427,11 @@ public class SessionKeeper { formatter.close(); } - sha1Fingerprint = sb.toString().toUpperCase(); + sha256Fingerprint = sb.toString().toUpperCase(); } - builder.append(new JLabel("<html><b>SHA-1 Fingerprint:</b></html>"), - new JLabel(sha1Fingerprint)); - builder.nextLine(); - - String md5Fingerprint = ""; - { - MessageDigest md = MessageDigest.getInstance("MD5"); - byte[] der = cert.getEncoded(); - md.update(der); - byte[] digest = md.digest(); - - StringBuilder sb = new StringBuilder(digest.length * 2); - - Formatter formatter = new Formatter(sb); - try - { - for(int i = 0; i < digest.length;) - { - formatter.format("%02x", digest[i]); - i++; - if(i < digest.length) - { - sb.append(":"); - } - } - } - finally - { - formatter.close(); - } - md5Fingerprint = sb.toString().toUpperCase(); - } - builder.append(new JLabel("<html><b>MD5 Fingerprint:</b></html>"), new JLabel(md5Fingerprint)); + builder.append(new JLabel("<html><b>SHA-256 Fingerprint:</b></html>"), + new JLabel(sha256Fingerprint)); builder.nextLine(); return builder.getPanel(); |