diff options
| author | Miguel Aranda <miguelaranda@google.com> | 2024-04-10 17:49:53 +0000 |
|---|---|---|
| committer | Miguel Aranda <miguelaranda@google.com> | 2024-04-10 17:49:53 +0000 |
| commit | d0aa57fc3bac8de75278baa9c062373afdba8179 (patch) | |
| tree | 6bbe68c4036f1f3f0cc5ffedeef57c49cc7d68a9 | |
| parent | 7a0edf317e760f6f449cfd116cfd9afc663bf887 (diff) | |
| download | conscrypt-d0aa57fc3bac8de75278baa9c062373afdba8179.tar.gz | |
Fix for test error for tls 1.0 adn 1.1 removal
Bug: 333732674
Change-Id: I1c84900110b0e510168b3247119d2e7a461da215
| -rw-r--r-- | repackaged/testing/src/main/java/com/android/org/conscrypt/java/security/StandardNames.java | 18 | ||||
| -rw-r--r-- | testing/src/main/java/org/conscrypt/java/security/StandardNames.java | 17 |
2 files changed, 26 insertions, 9 deletions
diff --git a/repackaged/testing/src/main/java/com/android/org/conscrypt/java/security/StandardNames.java b/repackaged/testing/src/main/java/com/android/org/conscrypt/java/security/StandardNames.java index 1bf9b872..2c3f66dd 100644 --- a/repackaged/testing/src/main/java/com/android/org/conscrypt/java/security/StandardNames.java +++ b/repackaged/testing/src/main/java/com/android/org/conscrypt/java/security/StandardNames.java @@ -152,11 +152,19 @@ public final class StandardNames { if (!IS_RI) { provideCipherPaddings("AES", new String[] {"PKCS7Padding"}); } - - provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv12, TLSVersion.TLSv13); - provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.TLSv12, TLSVersion.TLSv12); - provideSslContextEnabledProtocols("TLSv1.3", TLSVersion.TLSv12, TLSVersion.TLSv13); - provideSslContextEnabledProtocols("Default", TLSVersion.TLSv12, TLSVersion.TLSv13); + if (TestUtils.isTlsV1Supported()) { + provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv1, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("TLSv1", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.1", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.3", TLSVersion.TLSv1, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("Default", TLSVersion.TLSv1, TLSVersion.TLSv13); + } else { + provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv12, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.TLSv12, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.3", TLSVersion.TLSv12, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("Default", TLSVersion.TLSv12, TLSVersion.TLSv13); + } } public static final String SSL_CONTEXT_PROTOCOLS_DEFAULT = "Default"; diff --git a/testing/src/main/java/org/conscrypt/java/security/StandardNames.java b/testing/src/main/java/org/conscrypt/java/security/StandardNames.java index 609581d5..ca493e1a 100644 --- a/testing/src/main/java/org/conscrypt/java/security/StandardNames.java +++ b/testing/src/main/java/org/conscrypt/java/security/StandardNames.java @@ -152,10 +152,19 @@ public final class StandardNames { provideCipherPaddings("AES", new String[] {"PKCS7Padding"}); } - provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv12, TLSVersion.TLSv13); - provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.TLSv12, TLSVersion.TLSv12); - provideSslContextEnabledProtocols("TLSv1.3", TLSVersion.TLSv12, TLSVersion.TLSv13); - provideSslContextEnabledProtocols("Default", TLSVersion.TLSv12, TLSVersion.TLSv13); + if (TestUtils.isTlsV1Supported()) { + provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv1, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("TLSv1", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.1", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.3", TLSVersion.TLSv1, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("Default", TLSVersion.TLSv1, TLSVersion.TLSv13); + } else { + provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv12, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.TLSv12, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.3", TLSVersion.TLSv12, TLSVersion.TLSv13); + provideSslContextEnabledProtocols("Default", TLSVersion.TLSv12, TLSVersion.TLSv13); + } } public static final String SSL_CONTEXT_PROTOCOLS_DEFAULT = "Default"; |