Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Introduce TLSUtils.setEnabledTlsProtocolsToRecommended(B builder)

Browse source 
And deprecate no longer recommended methods.

Thanks to Milan Kral <milan.kral@azet.sk> for the initial PR which
triggered this commit.
This commit is contained in:
Florian Schmaus 2020-04-05 22:26:18 +02:00
parent 69e9f3c044
commit 8b0de5ff85
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
View file

@ -61,6 +61,20 @@ public class TLSUtils {
public static final String PROTO_TLSV1 = TLS + "v1"; public static final String PROTO_TLSV1 = TLS + "v1";
public static final String PROTO_TLSV1_1 = TLS + "v1.1"; public static final String PROTO_TLSV1_1 = TLS + "v1.1";
public static final String PROTO_TLSV1_2 = TLS + "v1.2"; public static final String PROTO_TLSV1_2 = TLS + "v1.2";
public static final String PROTO_TLSV1_3 = TLS + "v1.3";
/**
* Enable the recommended TLS protocols.
*
* @param builder the configuration builder to apply this setting to
* @param <B> Type of the ConnectionConfiguration builder.
*
* @return the given builder
*/
public static <B extends ConnectionConfiguration.Builder<B, ?>> B setEnabledTlsProtocolsToRecommended(B builder) {
builder.setEnabledSSLProtocols(new String[] { PROTO_TLSV1_3, PROTO_TLSV1_2 });
return builder;
}
/** /**
* Enable only TLS. Connections created with the given ConnectionConfiguration will only support TLS. * Enable only TLS. Connections created with the given ConnectionConfiguration will only support TLS.
@ -76,7 +90,10 @@ public class TLSUtils {
* @param <B> Type of the ConnectionConfiguration builder. * @param <B> Type of the ConnectionConfiguration builder.
* *
* @return the given builder * @return the given builder
* @deprecated use {@link #setEnabledTlsProtocolsToRecommended(org.jivesoftware.smack.ConnectionConfiguration.Builder)} instead.
*/ */
// TODO: Remove in Smack 4.5.
@Deprecated
public static <B extends ConnectionConfiguration.Builder<B, ?>> B setTLSOnly(B builder) { public static <B extends ConnectionConfiguration.Builder<B, ?>> B setTLSOnly(B builder) {
builder.setEnabledSSLProtocols(new String[] { PROTO_TLSV1_2, PROTO_TLSV1_1, PROTO_TLSV1 }); builder.setEnabledSSLProtocols(new String[] { PROTO_TLSV1_2, PROTO_TLSV1_1, PROTO_TLSV1 });
return builder; return builder;
@ -96,7 +113,10 @@ public class TLSUtils {
* @param <B> Type of the ConnectionConfiguration builder. * @param <B> Type of the ConnectionConfiguration builder.
* *
* @return the given builder * @return the given builder
* @deprecated use {@link #setEnabledTlsProtocolsToRecommended(org.jivesoftware.smack.ConnectionConfiguration.Builder)} instead.
*/ */
// TODO: Remove in Smack 4.5.
@Deprecated
public static <B extends ConnectionConfiguration.Builder<B, ?>> B setSSLv3AndTLSOnly(B builder) { public static <B extends ConnectionConfiguration.Builder<B, ?>> B setSSLv3AndTLSOnly(B builder) {
builder.setEnabledSSLProtocols(new String[] { PROTO_TLSV1_2, PROTO_TLSV1_1, PROTO_TLSV1, PROTO_SSL3 }); builder.setEnabledSSLProtocols(new String[] { PROTO_TLSV1_2, PROTO_TLSV1_1, PROTO_TLSV1, PROTO_SSL3 });
return builder; return builder;