narayana/Conversations-Classic
3
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

store SSLSocket after starttls to fix channel binding mechanism detection

Browse source
This commit is contained in:
Daniel Gultsch 2023-10-23 14:40:40 +02:00
parent 68eb17d400
commit 55a77c083f
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -1260,8 +1260,9 @@ public class XmppConnection implements Runnable {
tagReader.readTag();
final Socket socket = this.socket;
final SSLSocket sslSocket = upgradeSocketToTls(socket);
tagReader.setInputStream(sslSocket.getInputStream());
tagWriter.setOutputStream(sslSocket.getOutputStream());
this.socket = sslSocket;
this.tagReader.setInputStream(sslSocket.getInputStream());
this.tagWriter.setOutputStream(sslSocket.getOutputStream());
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": TLS connection established");
final boolean quickStart;
try {
@ -2218,9 +2219,13 @@ public class XmppConnection implements Runnable {
private boolean establishStream(final SSLSockets.Version sslVersion)
throws IOException, InterruptedException {
final SaslMechanism quickStartMechanism =
SaslMechanism.ensureAvailable(account.getQuickStartMechanism(), sslVersion);
final boolean secureConnection = sslVersion != SSLSockets.Version.NONE;
final SaslMechanism quickStartMechanism;
if (secureConnection) {
quickStartMechanism = SaslMechanism.ensureAvailable(account.getQuickStartMechanism(), sslVersion);
} else {
quickStartMechanism = null;
}
if (secureConnection
&& Config.QUICKSTART_ENABLED
&& quickStartMechanism != null