Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public ConscryptClientTlsStrategy(final SSLContext sslContext) {
* @since 5.2
*/
public ConscryptClientTlsStrategy() {
this(SSLContexts.createSystemDefault(), null, null, null);
this(SSLContexts.createDefault(), null, null, null);
}

/**
Expand All @@ -102,7 +102,7 @@ public ConscryptClientTlsStrategy() {
* @since 5.2
*/
public ConscryptClientTlsStrategy(final SSLSessionVerifier verifier) {
this(SSLContexts.createSystemDefault(), verifier);
this(SSLContexts.createDefault(), verifier);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public ConscryptServerTlsStrategy(final SSLContext sslContext) {
* @since 5.2
*/
public ConscryptServerTlsStrategy() {
this(SSLContexts.createSystemDefault(), (SSLBufferMode) null, null, null);
this(SSLContexts.createDefault(), (SSLBufferMode) null, null, null);
}

/**
Expand All @@ -160,7 +160,7 @@ public ConscryptServerTlsStrategy() {
* @since 5.2
*/
public ConscryptServerTlsStrategy(final SSLSessionVerifier verifier) {
this(SSLContexts.createSystemDefault(), (SSLBufferMode) null, null, verifier);
this(SSLContexts.createDefault(), (SSLBufferMode) null, null, verifier);
}

private boolean isApplicable(final SocketAddress localAddress) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public H2ClientTlsStrategy(final SSLContext sslContext) {
}

public H2ClientTlsStrategy() {
this(SSLContexts.createSystemDefault());
this(SSLContexts.createDefault());
}

/**
Expand All @@ -100,7 +100,7 @@ public H2ClientTlsStrategy() {
* @since 5.2
*/
public H2ClientTlsStrategy( final SSLSessionVerifier verifier) {
this(SSLContexts.createSystemDefault(), null, null, verifier);
this(SSLContexts.createDefault(), null, null, verifier);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public H2ServerTlsStrategy(final SSLContext sslContext,
*/
@Deprecated
public H2ServerTlsStrategy(final int... securePorts) {
this(SSLContexts.createSystemDefault(), new org.apache.hc.core5.http.nio.ssl.FixedPortStrategy(securePorts));
this(SSLContexts.createDefault(), new org.apache.hc.core5.http.nio.ssl.FixedPortStrategy(securePorts));
}

public H2ServerTlsStrategy(
Expand Down Expand Up @@ -146,7 +146,7 @@ public H2ServerTlsStrategy(final SSLContext sslContext) {
}

public H2ServerTlsStrategy() {
this(SSLContexts.createSystemDefault());
this(SSLContexts.createDefault());
}

private boolean isApplicable(final SocketAddress localAddress) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public Results execute() throws Exception {
}
sslContext = sslContextBuilder.build();
} else {
sslContext = SSLContexts.createSystemDefault();
sslContext = SSLContexts.createDefault();
}

final HttpVersionPolicy versionPolicy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public BasicClientTlsStrategy(final SSLContext sslContext) {
}

public BasicClientTlsStrategy() {
this(SSLContexts.createSystemDefault());
this(SSLContexts.createDefault());
}

/**
Expand All @@ -102,7 +102,7 @@ public BasicClientTlsStrategy() {
* @since 5.2
*/
public BasicClientTlsStrategy(final SSLSessionVerifier verifier) {
this(SSLContexts.createSystemDefault(), verifier);
this(SSLContexts.createDefault(), verifier);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public BasicServerTlsStrategy(final SSLContext sslContext, final SecurePortStrat
*/
@Deprecated
public BasicServerTlsStrategy(final SecurePortStrategy securePortStrategy) {
this(SSLContexts.createSystemDefault(), securePortStrategy);
this(SSLContexts.createDefault(), securePortStrategy);
}

/**
Expand All @@ -125,7 +125,7 @@ public BasicServerTlsStrategy(final SecurePortStrategy securePortStrategy) {
* @since 5.2
*/
public BasicServerTlsStrategy(final SSLSessionVerifier verifier) {
this(SSLContexts.createSystemDefault(), verifier);
this(SSLContexts.createDefault(), verifier);
}

public BasicServerTlsStrategy(
Expand Down Expand Up @@ -158,7 +158,7 @@ public BasicServerTlsStrategy(final SSLContext sslContext) {
}

public BasicServerTlsStrategy() {
this(SSLContexts.createSystemDefault());
this(SSLContexts.createDefault());
}

private boolean isApplicable(final SocketAddress localAddress) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ void createDefault() {
}

@Test
@SuppressWarnings("deprecation")
void createSystemDefault() {
final SSLContext sslContext = SSLContexts.createSystemDefault();
assertAll(
Expand Down
Loading