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

tls-psk: move more magic values into constants

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-06-12 13:08:26 +02:00
parent db3210e67c
commit e470072210
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java
View File

@@ -80,8 +80,10 @@ public class KeyTransferInteractor {
private static final int CONNECTION_ERROR_CONNECT = 6; private static final int CONNECTION_ERROR_CONNECT = 6;
private static final int CONNECTION_ERROR_LISTEN = 7; private static final int CONNECTION_ERROR_LISTEN = 7;
private static final String QRCODE_URI_FORMAT = "PGP+TRANSFER://%s@%s:%s";
private static final int TIMEOUT_RECEIVING = 2000; private static final int TIMEOUT_RECEIVING = 2000;
private static final int TIMEOUT_WAITING = 500; private static final int TIMEOUT_WAITING = 500;
private static final int PSK_BYTE_LENGTH = 16;
private final String delimiterStart; private final String delimiterStart;
@@ -191,8 +193,8 @@ public class KeyTransferInteractor {
serverSocket.setEnabledCipherSuites(enabledCipherSuites); serverSocket.setEnabledCipherSuites(enabledCipherSuites);
String presharedKeyEncoded = Hex.toHexString(presharedKey); String presharedKeyEncoded = Hex.toHexString(presharedKey);
String qrCodeData = String qrCodeData = String.format(
"pgp+transfer://" + presharedKeyEncoded + "@" + getIPAddress(true) + ":" + serverSocket.getLocalPort(); QRCODE_URI_FORMAT, presharedKeyEncoded, getIPAddress(true), serverSocket.getLocalPort());
qrCodeData = qrCodeData.toUpperCase(Locale.getDefault()); qrCodeData = qrCodeData.toUpperCase(Locale.getDefault());
invokeListener(CONNECTION_LISTENING, qrCodeData); invokeListener(CONNECTION_LISTENING, qrCodeData);
@@ -363,7 +365,7 @@ public class KeyTransferInteractor {
} }
private static byte[] generatePresharedKey() { private static byte[] generatePresharedKey() {
byte[] presharedKey = new byte[16]; byte[] presharedKey = new byte[PSK_BYTE_LENGTH];
new SecureRandom().nextBytes(presharedKey); new SecureRandom().nextBytes(presharedKey);
return presharedKey; return presharedKey;
} }