diff options
| author | Sam Whited <sam@samwhited.com> | 2015-02-02 08:33:55 -0500 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2015-02-02 11:16:22 -0500 |
| commit | 03d30e4fdb0b60c4c4531703495a385c97cfbe10 (patch) | |
| tree | 6ade59a4618348c3213ff00565d910ef696a80e4 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Use platform ciphers as well, just prefer ours
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 19e271b2..121d8a54 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -515,8 +515,9 @@ public class XmppConnection implements Runnable { sslSocket.setEnabledProtocols(supportProtocols); - final String[] cipherSuites = CryptoHelper.getSupportedCipherSuites( + final String[] cipherSuites = CryptoHelper.getOrderedCipherSuites( sslSocket.getSupportedCipherSuites()); + Log.d(Config.LOGTAG, "Using ciphers: " + Arrays.toString(cipherSuites)); if (cipherSuites.length > 0) { sslSocket.setEnabledCipherSuites(cipherSuites); } |