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

Fix parsing of EOL in keyserver answer

This commit is contained in:
Stelian Pop 2021-04-16 11:36:25 +02:00
parent 8f59c6f73b
commit 20caa22f05
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserverClient.java
View File

@ -54,7 +54,7 @@ import static java.util.Locale.ENGLISH;
public class HkpKeyserverClient implements KeyserverClient { public class HkpKeyserverClient implements KeyserverClient {
private static final Pattern INFO_LINE = Pattern private static final Pattern INFO_LINE = Pattern
.compile("^info:1:([0-9]*)\n", Pattern.CASE_INSENSITIVE); .compile("^info:1:([0-9]*)\r?\n", Pattern.CASE_INSENSITIVE);
/** /**
* uid:%escaped uid string%:%creationdate%:%expirationdate%:%flags% * uid:%escaped uid string%:%creationdate%:%expirationdate%:%flags%
@ -82,11 +82,11 @@ public class HkpKeyserverClient implements KeyserverClient {
*/ */
private static final Pattern UID_LINE = Pattern private static final Pattern UID_LINE = Pattern
.compile("(uid:" + // group 1 .compile("(uid:" + // group 1
"([^:\n]*)" + // group 2 "([^:\r?\n]*)" +// group 2
"(?::([0-9]*)" + // group 3 "(?::([0-9]*)" + // group 3
"(?::([0-9]*)" + // group 4 "(?::([0-9]*)" + // group 4
"(?::(((?=(r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 5 "(?::(((?=(r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 5
")?)?)?\n)", ")?)?)?\r?\n)",
Pattern.CASE_INSENSITIVE); Pattern.CASE_INSENSITIVE);
/** /**
@ -128,7 +128,7 @@ public class HkpKeyserverClient implements KeyserverClient {
"(?::([0-9]*)" + // group 5 "(?::([0-9]*)" + // group 5
"(?::([0-9]*)" + // group 6 "(?::([0-9]*)" + // group 6
"(?::((?:(?=(?:r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 7 "(?::((?:(?=(?:r(?!(.?r))|d(?!(.?d))|e(?!(.?e))))[rde]){0,3})" + // group 7
")?)?)?)?)?\n)"// pub line ")?)?)?)?)?\r\n)"// pub line
+ "(" + UID_LINE.pattern() + // group 11 + "(" + UID_LINE.pattern() + // group 11
"+)", // one or more uid lines "+)", // one or more uid lines
Pattern.CASE_INSENSITIVE Pattern.CASE_INSENSITIVE