diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverClient.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverClient.java index 5adee8c4b..c94854a68 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverClient.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverClient.java @@ -81,11 +81,11 @@ public class HkpKeyserverClient implements KeyserverClient { * */ private static final Pattern UID_LINE = Pattern - .compile("(?uid:" + // group 1 - "(?[^:\n]*)" + // group 2 - "(?::(?[0-9]*)" + // group 3 - "(?::(?[0-9]*)" + // group 4 - "(?::(?((?=(r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 5 + .compile("(uid:" + // group 1 + "([^:\n]*)" + // group 2 + "(?::([0-9]*)" + // group 3 + "(?::([0-9]*)" + // group 4 + "(?::(((?=(r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 5 ")?)?)?\n)", Pattern.CASE_INSENSITIVE); @@ -121,15 +121,15 @@ public class HkpKeyserverClient implements KeyserverClient { * in Internet-Draft OpenPGP HTTP Keyserver Protocol Document */ private static final Pattern PUB_KEY_LINE = Pattern - .compile( "(?pub:" + // group 1 - "(?[0-9a-fA-F]+)" + // group 2 - "(?::(?[0-9]*)" + // group 3 - "(?::(?[0-9]*)" + // group 4 - "(?::(?[0-9]*)" + // group 5 - "(?::(?[0-9]*)" + // group 6 - "(?::(?(?:(?=(?:r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 7 + .compile( "(pub:" + // group 1 + "([0-9a-fA-F]+)" + // group 2 + "(?::([0-9]*)" + // group 3 + "(?::([0-9]*)" + // group 4 + "(?::([0-9]*)" + // group 5 + "(?::([0-9]*)" + // group 6 + "(?::((?:(?=(?:r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 7 ")?)?)?)?)?\n)"// pub line - + "(?" + UID_LINE.pattern() + // group 11 + + "(" + UID_LINE.pattern() + // group 11 "+)", // one or more uid lines Pattern.CASE_INSENSITIVE );