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

Merge pull request #2493 from Anders-Linden/master

Browse Source 
Adding support for WKD Advanced method
This commit is contained in:
Dominik Schürmann
2019-10-22 16:23:04 +02:00
committed by GitHub
parent ea023aaf18 ff4c6684e1
commit d44cb1dc24
3 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/WebKeyDirectoryUtil.java
View File

@@ -23,12 +23,12 @@ public class WebKeyDirectoryUtil {
* @see <a href="https://tools.ietf.org/html/draft-koch-openpgp-webkey-service-05#section-3.1">Key Discovery</a>
*/
@Nullable
public static URL toWebKeyDirectoryURL(String name) {
public static URL toWebKeyDirectoryURL(String name, Boolean wkdMethodAdvanced) {
if (name == null) {
return null;
}
if (name.startsWith("https://") && name.contains("/.well-known/openpgpkey/hu/")) {
if (name.startsWith("https://") && name.contains("/.well-known/openpgpkey/")) {
try {
return new URL(name);
} catch (MalformedURLException e) {
@@ -47,10 +47,18 @@ public class WebKeyDirectoryUtil {
String domain = matcher.group(2);
try {
return new URL("https://" + domain + "/.well-known/openpgpkey/hu/" + encodedPart);
if(wkdMethodAdvanced) {
// Advanced method
return new URL("https://openpgpkey." + domain + "/.well-known/openpgpkey/" + domain + "/hu/" + encodedPart);
}else{
// Direct method
return new URL("https://" + domain + "/.well-known/openpgpkey/hu/" + encodedPart);
}
} catch (MalformedURLException e) {
return null;
}
}
private static byte[] toSHA1(byte[] input) {