moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Fix crash with v3 key fingerprints

Browse Source
This commit is contained in:
Dominik Schürmann 2015-05-10 12:11:35 +02:00
parent 0a29f6d3ac
commit e4b7920edc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java
View File

@ -216,7 +216,16 @@ public class KeyFormattingUtils {
* @return
*/
public static String convertFingerprintToHex(byte[] fingerprint) {
return Hex.toHexString(fingerprint, 0, 20).toLowerCase(Locale.ENGLISH);
// NOTE: Even though v3 keys are not imported we need to support both fingerprints for
// display/comparison before import
// Also better cut of unneeded parts, e.g., for fingerprints returned from YubiKeys
if (fingerprint.length < 20) {
// v3 key fingerprint with 128 bit (MD5)
return Hex.toHexString(fingerprint, 0, 16).toLowerCase(Locale.ENGLISH);
} else {
// v4 key fingerprint with 160 bit (SHA1)
return Hex.toHexString(fingerprint, 0, 20).toLowerCase(Locale.ENGLISH);
}
}
public static long getKeyIdFromFingerprint(byte[] fingerprint) {