From 62c50e98430e8f17d77057c6123f075c433979b7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 3 Jun 2015 17:01:14 -0700 Subject: Replace hyphen with en dash Since this is a number range, the appropriate punctuation is actually en dash. (cherry picked from commit 814e15db27ab930f59c8e6731b901a6c82b8e262) Bug: 21522548 Change-Id: I99fe4c3a45b2df00671af4b6b82b21aa2c265820 --- luni/src/main/java/javax/net/ssl/SSLEngine.java | 104 ++++++++++---------- luni/src/main/java/javax/net/ssl/SSLSocket.java | 120 ++++++++++++------------ 2 files changed, 112 insertions(+), 112 deletions(-) (limited to 'luni/src/main/java') diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index f40f4b0..1d3d73a 100644 --- a/luni/src/main/java/javax/net/ssl/SSLEngine.java +++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java @@ -73,33 +73,33 @@ import java.nio.ByteBuffer; * * * SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA - * 9-22 - * 9-19 + * 9–22 + * 9–19 * * * SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA - * 9-22 - * 9-19 + * 9–22 + * 9–19 * * * SSL_DHE_DSS_WITH_DES_CBC_SHA - * 9-22 - * 9-19 + * 9–22 + * 9–19 * * * SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_DHE_RSA_WITH_DES_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA @@ -129,22 +129,22 @@ import java.nio.ByteBuffer; * * SSL_RSA_EXPORT_WITH_DES40_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_EXPORT_WITH_RC4_40_MD5 * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_3DES_EDE_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_DES_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_NULL_MD5 @@ -159,7 +159,7 @@ import java.nio.ByteBuffer; * * SSL_RSA_WITH_RC4_128_MD5 * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_RC4_128_SHA @@ -168,58 +168,58 @@ import java.nio.ByteBuffer; * * * TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_DHE_DSS_WITH_AES_128_CBC_SHA - * 9-22 - * 9-22 + * 9–22 + * 9–22 * * * TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 - * 20-22 + * 20–22 * * * * TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 - * 20-22 + * 20–22 * * * * TLS_DHE_DSS_WITH_AES_256_CBC_SHA - * 9-22 - * 20-22 + * 9–22 + * 20–22 * * * TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 - * 20-22 + * 20–22 * * * * TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 - * 20-22 + * 20–22 * * * * TLS_DHE_DSS_WITH_DES_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_DHE_RSA_WITH_AES_128_CBC_SHA @@ -253,47 +253,47 @@ import java.nio.ByteBuffer; * * * TLS_DHE_RSA_WITH_DES_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA - * 1-8 + * 1–8 * * * * TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA - * 1-8 + * 1–8 * * * * TLS_DH_DSS_WITH_DES_CBC_SHA - * 1-8 + * 1–8 * * * * TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA - * 1-8 + * 1–8 * * * * TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA - * 1-8 + * 1–8 * * * * TLS_DH_RSA_WITH_DES_CBC_SHA - * 1-8 + * 1–8 * * * * TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA - * 1-8 + * 1–8 * * * * TLS_DH_anon_WITH_3DES_EDE_CBC_SHA - * 1-8 + * 1–8 * * * @@ -328,7 +328,7 @@ import java.nio.ByteBuffer; * * * TLS_DH_anon_WITH_DES_CBC_SHA - * 1-8 + * 1–8 * * * @@ -558,7 +558,7 @@ import java.nio.ByteBuffer; * * * TLS_NULL_WITH_NULL_NULL - * 1-8 + * 1–8 * * * @@ -583,13 +583,13 @@ import java.nio.ByteBuffer; * * * TLS_RSA_EXPORT_WITH_DES40_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_RSA_WITH_3DES_EDE_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_RSA_WITH_AES_128_CBC_SHA @@ -623,17 +623,17 @@ import java.nio.ByteBuffer; * * * TLS_RSA_WITH_DES_CBC_SHA - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * TLS_RSA_WITH_NULL_MD5 - * 1-8 + * 1–8 * * * * TLS_RSA_WITH_NULL_SHA - * 1-8 + * 1–8 * * * diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index c6906c5..e60bad1 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -117,33 +117,33 @@ import java.net.UnknownHostException; * * * SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA - * 9-22 - * 9-19 + * 9–22 + * 9–19 * * * SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA - * 9-22 - * 9-19 + * 9–22 + * 9–19 * * * SSL_DHE_DSS_WITH_DES_CBC_SHA - * 9-22 - * 9-19 + * 9–22 + * 9–19 * * * SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_DHE_RSA_WITH_DES_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA @@ -173,22 +173,22 @@ import java.net.UnknownHostException; * * SSL_RSA_EXPORT_WITH_DES40_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_EXPORT_WITH_RC4_40_MD5 * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_3DES_EDE_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_DES_CBC_SHA * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_NULL_MD5 @@ -203,7 +203,7 @@ import java.net.UnknownHostException; * * SSL_RSA_WITH_RC4_128_MD5 * 9+ - * 9-19 + * 9–19 * * * SSL_RSA_WITH_RC4_128_SHA @@ -212,32 +212,32 @@ import java.net.UnknownHostException; * * * TLS_DHE_DSS_WITH_AES_128_CBC_SHA - * 9-22 - * 9-22 + * 9–22 + * 9–22 * * * TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 - * 20-22 + * 20–22 * * * * TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 - * 20-22 + * 20–22 * * * * TLS_DHE_DSS_WITH_AES_256_CBC_SHA - * 9-22 - * 11-22 + * 9–22 + * 11–22 * * * TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 - * 20-22 + * 20–22 * * * * TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 - * 20-22 + * 20–22 * * * @@ -303,7 +303,7 @@ import java.net.UnknownHostException; * * TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA @@ -358,7 +358,7 @@ import java.net.UnknownHostException; * * TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA @@ -403,12 +403,12 @@ import java.net.UnknownHostException; * * TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 @@ -423,7 +423,7 @@ import java.net.UnknownHostException; * * TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 @@ -443,17 +443,17 @@ import java.net.UnknownHostException; * * TLS_ECDH_ECDSA_WITH_RC4_128_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_RSA_WITH_AES_128_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 @@ -468,7 +468,7 @@ import java.net.UnknownHostException; * * TLS_ECDH_RSA_WITH_AES_256_CBC_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 @@ -488,7 +488,7 @@ import java.net.UnknownHostException; * * TLS_ECDH_RSA_WITH_RC4_128_SHA * 11+ - * 11-19 + * 11–19 * * * TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA @@ -610,43 +610,43 @@ import java.net.UnknownHostException; * AES256-SHA * TLS_RSA_WITH_AES_256_CBC_SHA * 1+ - * 1-8, 11+ + * 1–8, 11+ * * * DES-CBC-MD5 * SSL_CK_DES_64_CBC_WITH_MD5 - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * DES-CBC-SHA * SSL_RSA_WITH_DES_CBC_SHA * 1+ - * 1-19 + * 1–19 * * * DES-CBC3-MD5 * SSL_CK_DES_192_EDE3_CBC_WITH_MD5 - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * DES-CBC3-SHA * SSL_RSA_WITH_3DES_EDE_CBC_SHA * 1+ - * 1-19 + * 1–19 * * * DHE-DSS-AES128-SHA * TLS_DHE_DSS_WITH_AES_128_CBC_SHA - * 1-22 - * 1-22 + * 1–22 + * 1–22 * * * DHE-DSS-AES256-SHA * TLS_DHE_DSS_WITH_AES_256_CBC_SHA - * 1-22 - * 1-8, 11-22 + * 1–22 + * 1–8, 11–22 * * * DHE-RSA-AES128-SHA @@ -658,73 +658,73 @@ import java.net.UnknownHostException; * DHE-RSA-AES256-SHA * TLS_DHE_RSA_WITH_AES_256_CBC_SHA * 1+ - * 1-8, 11+ + * 1–8, 11+ * * * EDH-DSS-DES-CBC-SHA * SSL_DHE_DSS_WITH_DES_CBC_SHA - * 1-22 - * 1-19 + * 1–22 + * 1–19 * * * EDH-DSS-DES-CBC3-SHA * SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA - * 1-22 - * 1-19 + * 1–22 + * 1–19 * * * EDH-RSA-DES-CBC-SHA * SSL_DHE_RSA_WITH_DES_CBC_SHA * 1+ - * 1-19 + * 1–19 * * * EDH-RSA-DES-CBC3-SHA * SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA * 1+ - * 1-19 + * 1–19 * * * EXP-DES-CBC-SHA * SSL_RSA_EXPORT_WITH_DES40_CBC_SHA * 1+ - * 1-19 + * 1–19 * * * EXP-EDH-DSS-DES-CBC-SHA * SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA - * 1-22 - * 1-19 + * 1–22 + * 1–19 * * * EXP-EDH-RSA-DES-CBC-SHA * SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA * 1+ - * 1-19 + * 1–19 * * * EXP-RC2-CBC-MD5 * SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5 - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * EXP-RC4-MD5 * SSL_RSA_EXPORT_WITH_RC4_40_MD5 * 1+ - * 1-19 + * 1–19 * * * RC2-CBC-MD5 * SSL_CK_RC2_128_CBC_WITH_MD5 - * 1-8 - * 1-8 + * 1–8 + * 1–8 * * * RC4-MD5 * SSL_RSA_WITH_RC4_128_MD5 * 1+ - * 1-19 + * 1–19 * * * RC4-SHA -- cgit v1.1