diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-04-27 20:07:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-27 20:07:22 +0000 |
| commit | 41e2c9992f4ecfedad9191b0c8c102e2deeb57a1 (patch) | |
| tree | bf3b7813a2d39f4910218f5f6f770e9261644cf5 | |
| parent | 6ae402aa03bbc08d5007bcd2c4fac05dc3da0092 (diff) | |
| parent | e7232e286072b11a6d41a4c2c4e8abd47cc4985b (diff) | |
| download | okhttp-41e2c9992f4ecfedad9191b0c8c102e2deeb57a1.tar.gz | |
Merge "Snap for 7309127 from d99a2fdd77ef7b40e392b57310458aeccecb758e to pie-cts-release" into pie-cts-releaseandroid-cts-9.0_r20android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17pie-cts-release
| -rw-r--r-- | okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionSpecTest.java | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionSpecTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionSpecTest.java index 47eee24..2318a68 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionSpecTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionSpecTest.java @@ -87,7 +87,8 @@ public final class ConnectionSpecTest { SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); socket.setEnabledCipherSuites(new String[] { CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName, - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName, + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName, }); socket.setEnabledProtocols(new String[] { TlsVersion.TLS_1_2.javaName, @@ -102,7 +103,8 @@ public final class ConnectionSpecTest { Set<String> expectedCipherSet = set( CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName, - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName); + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName); assertEquals(expectedCipherSet, expectedCipherSet); } @@ -115,7 +117,8 @@ public final class ConnectionSpecTest { SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); socket.setEnabledCipherSuites(new String[] { CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName, - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName, + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName, }); socket.setEnabledProtocols(new String[] { TlsVersion.TLS_1_2.javaName, @@ -130,7 +133,8 @@ public final class ConnectionSpecTest { Set<String> expectedCipherSet = set( CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName, - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName); + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName); if (Arrays.asList(socket.getSupportedCipherSuites()).contains("TLS_FALLBACK_SCSV")) { expectedCipherSet.add("TLS_FALLBACK_SCSV"); } @@ -147,7 +151,8 @@ public final class ConnectionSpecTest { SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); socket.setEnabledCipherSuites(new String[] { CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName, - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName, + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName, }); socket.setEnabledProtocols(new String[] { TlsVersion.TLS_1_2.javaName, @@ -189,13 +194,15 @@ public final class ConnectionSpecTest { }); socket.setEnabledCipherSuites(new String[] { - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName, + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName, CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName, }); assertTrue(tlsSpec.isCompatible(socket)); socket.setEnabledCipherSuites(new String[] { - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName, + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName, }); assertFalse(tlsSpec.isCompatible(socket)); } @@ -208,13 +215,15 @@ public final class ConnectionSpecTest { SSLSocket sslSocket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); sslSocket.setEnabledCipherSuites(new String[] { - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName, + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName, CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName, }); tlsSpec.apply(sslSocket, false); assertEquals(Arrays.asList( - CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256.javaName, + // Android-changed: Replace removed CBC cipher with GCM version + CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256.javaName, CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA.javaName), Arrays.asList(sslSocket.getEnabledCipherSuites())); } |