From 3a728b94a65c774c29133bd0fa05f8f207f17507 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 2 Jun 2017 12:23:40 +0200 Subject: [PATCH] tls-psk: use automatically assigned port --- .../keychain/network/KeyTransferInteractor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 7ea4bcab7..7a3b56b6c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java @@ -164,15 +164,14 @@ public class KeyTransferInteractor { Socket socket; if (isServer) { try { - int port = 1336; - serverSocket = (SSLServerSocket) sslContext.getServerSocketFactory().createServerSocket(port); + serverSocket = (SSLServerSocket) sslContext.getServerSocketFactory().createServerSocket(0); String[] supportedCipherSuites = serverSocket.getSupportedCipherSuites(); String[] enabledCipherSuites = intersectArrays(supportedCipherSuites, ALLOWED_CIPHERSUITES); serverSocket.setEnabledCipherSuites(enabledCipherSuites); String presharedKeyEncoded = Hex.toHexString(presharedKey); String qrCodeData = - "pgp+transfer://" + presharedKeyEncoded + "@" + getIPAddress(true) + ":" + port; + "pgp+transfer://" + presharedKeyEncoded + "@" + getIPAddress(true) + ":" + serverSocket.getLocalPort(); qrCodeData = qrCodeData.toUpperCase(Locale.getDefault()); invokeListener(CONNECTION_LISTENING, qrCodeData);