cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed length identifiers

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-05 02:10:44 +01:00
parent 1f324be243
commit 9798ef7bfd
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java
View File

@@ -66,10 +66,8 @@ public abstract class LinkedCookieResource extends LinkedResource {
} }
public static String generate (Context context, byte[] fingerprint, int nonce) { public static String generate (Context context, byte[] fingerprint, int nonce) {
return String.format("\"[Verifying my PGP key: openpgp4fpr:%s#%08x]\"",
return "[Verifying my PGP key: openpgp4fpr:" KeyFormattingUtils.convertFingerprintToHex(fingerprint), nonce);
+ KeyFormattingUtils.convertFingerprintToHex(fingerprint) + "#" + Integer.toHexString(nonce) + "]";
} }
public static String generatePreview () { public static String generatePreview () {

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
View File

@@ -41,9 +41,8 @@ public class DnsResource extends LinkedCookieResource {
public static String generateText (Context context, byte[] fingerprint, int nonce) { public static String generateText (Context context, byte[] fingerprint, int nonce) {
return "pgpid+cookie=" return String.format("pgpid+cookie=%s;%08x",
+ KeyFormattingUtils.convertFingerprintToHex(fingerprint) + ";" KeyFormattingUtils.convertFingerprintToHex(fingerprint), nonce);
+ Integer.toHexString(nonce) + "";
} }