diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-12-12 22:59:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-12 22:59:42 +0000 |
| commit | 8f498ae3239c6c29f5bdbded9b92711222c57696 (patch) | |
| tree | 8ae9ae0197e79e5a60a95f05c04d6c5a4abcb6e6 /support/src | |
| parent | 5e528d9a535ca3bdf7aadd51889a6f467e731962 (diff) | |
| parent | b4675a53abbbb55acad213485636cf6a0d8b5bf6 (diff) | |
| download | libcore-8f498ae3239c6c29f5bdbded9b92711222c57696.zip libcore-8f498ae3239c6c29f5bdbded9b92711222c57696.tar.gz libcore-8f498ae3239c6c29f5bdbded9b92711222c57696.tar.bz2 | |
Merge "Javadoc the default configuration of SSLEngine."
Diffstat (limited to 'support/src')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index f21ffa7..554b6e8 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -636,7 +636,8 @@ public final class StandardNames extends Assert { // Note these are added in priority order as defined by RI 7 documentation. // defaultCipherSuites. // - // NOTE: This list needs to be kept in sync with Javadoc of javax.net.ssl.SSLSocket. + // NOTE: This list needs to be kept in sync with Javadoc of javax.net.ssl.SSLSocket and + // javax.net.ssl.SSLEngine. addNeither("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"); addNeither("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"); addNeither("TLS_RSA_WITH_AES_256_CBC_SHA256"); @@ -739,7 +740,8 @@ public final class StandardNames extends Assert { CIPHER_SUITES = (IS_RI) ? CIPHER_SUITES_RI : CIPHER_SUITES_OPENSSL; } - // NOTE: This list needs to be kept in sync with Javadoc of javax.net.ssl.SSLSocket. + // NOTE: This list needs to be kept in sync with Javadoc of javax.net.ssl.SSLSocket and + // javax.net.ssl.SSLEngine. public static final List<String> CIPHER_SUITES_DEFAULT = (IS_RI) ? Arrays.asList("TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA", |