diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-25 01:38:43 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-25 01:38:43 +0200 |
commit | 29e9b2fa1eb5cfcd1539027e54025120d5af6a3e (patch) | |
tree | 96ea2a98f7d9929049c00c169fffc813dccf3102 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | b10b14d9bc737edc56af0eec3a14bed5ebf3ea39 (diff) | |
download | open-keychain-29e9b2fa1eb5cfcd1539027e54025120d5af6a3e.tar.gz open-keychain-29e9b2fa1eb5cfcd1539027e54025120d5af6a3e.tar.bz2 open-keychain-29e9b2fa1eb5cfcd1539027e54025120d5af6a3e.zip |
Dont import more than 100 User IDs (OKC-01-002)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index ca98882d8..87e7ec461 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -457,11 +457,15 @@ public class UncachedKeyRing implements Serializable { // check for duplicate user ids if (processedUserIds.contains(userId)) { - log.add(LogType.MSG_KC_UID_DUP, - indent, 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); } + if (processedUserIds.size() > 100) { + log.add(LogType.MSG_KC_UID_TOO_MANY, indent, userId); + // strip out the user id + modified = PGPPublicKey.removeCertification(modified, rawUserId); + } processedUserIds.add(userId); PGPSignature selfCert = null; |