summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-05-17 16:10:53 -0700
committerBrian Carlstrom <bdc@google.com>2010-05-17 16:10:53 -0700
commitfd487fbac3547360ea81d96edea9827fad080f86 (patch)
tree4c9a346e53934f128f4d683f570cde1e1e0232fc /support
parent204cab3c22b4d75c866c95e2d2eec42e14cbd924 (diff)
downloadlibcore-fd487fbac3547360ea81d96edea9827fad080f86.zip
libcore-fd487fbac3547360ea81d96edea9827fad080f86.tar.gz
libcore-fd487fbac3547360ea81d96edea9827fad080f86.tar.bz2
Change Harmony CipherSuite to use JSSE names
Change text names of Harmony CipherSuite's (used by SSLEngine and some places with OpenSSL code) to match JSSE names. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java Added StandardName constant for SSL_NULL_WITH_NULL_NULL support/src/test/java/javax/net/ssl/StandardNames.java Marked test as working with above fix, changed to use newly defined constant. luni/src/test/java/javax/net/ssl/SSLSessionTest.java Change-Id: Id48d2adcbbff71306296f1fdf8ff970c618fdcc6
Diffstat (limited to 'support')
-rw-r--r--support/src/test/java/javax/net/ssl/StandardNames.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/support/src/test/java/javax/net/ssl/StandardNames.java b/support/src/test/java/javax/net/ssl/StandardNames.java
index bc3d97a..f7c71a3 100644
--- a/support/src/test/java/javax/net/ssl/StandardNames.java
+++ b/support/src/test/java/javax/net/ssl/StandardNames.java
@@ -73,6 +73,8 @@ public final class StandardNames {
"RSA_EXPORT1024",
"UNKNOWN"));
+ public static final String CIPHER_SUITE_INVALID = "SSL_NULL_WITH_NULL_NULL";
+
public static final Set<String> CIPHER_SUITES_NEITHER = new HashSet<String>();
public static final Set<String> CIPHER_SUITES_RI = new LinkedHashSet<String>();