From c494c3f70f1a12a730122b468a446f779ab0005c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 31 May 2017 22:04:41 +0200 Subject: [PATCH] tls-psk: return identity hint as client identity this is necessary for openssl, which expects "Client_identity" as default client identity hint --- .../keychain/network/KeyTransferInteractor.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java index e5ebcef40..2d92e6249 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java @@ -413,6 +413,16 @@ public class KeyTransferInteractor { this.presharedKey = presharedKey; } + @Override + public String chooseClientKeyIdentity(String identityHint, Socket socket) { + return identityHint; + } + + @Override + public String chooseClientKeyIdentity(String identityHint, SSLEngine engine) { + return identityHint; + } + @Override public SecretKey getKey(String identityHint, String identity, Socket socket) { return new SecretKeySpec(presharedKey, "AES");