aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-02-09 16:04:54 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-02-09 16:04:54 +0100
commitc3260d620e7f5712440496a60416b6f3389221aa (patch)
tree0ce9dbb96e564645699de5c5e71f592c1b62af6a /src/main/java/eu/siacs/conversations/Config.java
parent026be61b7290829899a685c119f8924550386494 (diff)
parent03d30e4fdb0b60c4c4531703495a385c97cfbe10 (diff)
Merge pull request #959 from SamWhited/ciphers_fix
Ciphers fix
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
-rw-r--r--src/main/java/eu/siacs/conversations/Config.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 7a50c47f..d8b3139e 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -34,8 +34,8 @@ public final class Config {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
- "TLS_ECDHE_RSA_AES_128_SHA",
- "TLS_ECDHE_RSA_AES_256_SHA",
+ "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
+ "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA384",