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

canonicalize: compare user ids as string rather than bytes

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-10-04 11:14:02 +02:00
parent 2b5341f0d4
commit ff144c7c11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,18 +362,18 @@ public class UncachedKeyRing {
}
}
ArrayList<byte[]> processedUserIds = new ArrayList<byte[]>();
ArrayList<String> processedUserIds = new ArrayList<String>();
for (byte[] rawUserId : new IterableIterator<byte[]>(masterKey.getRawUserIDs())) {
String userId = Utf8Util.fromUTF8ByteArrayReplaceBadEncoding(rawUserId);
// check for duplicate user ids
if (processedUserIds.contains(rawUserId)) {
if (processedUserIds.contains(userId)) {
log.add(LogType.MSG_KC_UID_DUP,
indent, userId);
// strip out the first found user id with this name
modified = PGPPublicKey.removeCertification(modified, rawUserId);
}
processedUserIds.add(rawUserId);
processedUserIds.add(userId);
PGPSignature selfCert = null;
revocation = null;