Skip to content

Commit

Permalink
Use SSLEngine-based SSLSocket by default.
Browse files Browse the repository at this point in the history
  • Loading branch information
prbprbprb committed Aug 18, 2020
1 parent 31f4f0e commit 1283c13
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion common/src/main/java/org/conscrypt/SSLUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
*/
final class SSLUtils {
static final boolean USE_ENGINE_SOCKET_BY_DEFAULT = Boolean.parseBoolean(
System.getProperty("org.conscrypt.useEngineSocketByDefault", "false"));
System.getProperty("org.conscrypt.useEngineSocketByDefault", "true"));
private static final int MAX_PROTOCOL_LENGTH = 255;

private static final Charset US_ASCII = Charset.forName("US-ASCII");
Expand Down
6 changes: 3 additions & 3 deletions openjdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ test {
include suiteClass, "org/conscrypt/ConscryptOpenJdkSuite.class"
}

task testEngineSocket(type: Test) {
task testFdSocket(type: Test) {
include suiteClass, "org/conscrypt/ConscryptOpenJdkSuite.class"
InvokerHelper.setProperties(testLogging, test.testLogging.properties)
systemProperties = test.systemProperties
systemProperty "org.conscrypt.useEngineSocketByDefault", true
systemProperty "org.conscrypt.useEngineSocketByDefault", false
}
check.dependsOn testEngineSocket
check.dependsOn testFdSocket

// Tests that involve interoperation with the OpenJDK TLS provider (generally to
// test renegotiation, since we don't support initiating renegotiation but do
Expand Down

0 comments on commit 1283c13

Please sign in to comment.