From 38157242e11e34e0df760f2bdf827177f567f104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 18 Apr 2021 10:24:37 +0200 Subject: [PATCH] HKP parsing: make \r optional in pubkey lines --- .../keychain/keyimport/HkpKeyserverClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e30542a32..d6875d28a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverClient.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverClient.java @@ -128,7 +128,7 @@ public class HkpKeyserverClient implements KeyserverClient { "(?::([0-9]*)" + // group 5 "(?::([0-9]*)" + // group 6 "(?::((?:(?=(?:r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 7 - ")?)?)?)?)?\r\n)"// pub line + ")?)?)?)?)?\r?\n)"// pub line + "(" + UID_LINE.pattern() + // group 11 "+)", // one or more uid lines Pattern.CASE_INSENSITIVE