From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 15 Nov 2012 19:14:47 +0000 (+0000)
Subject: add "missing" TLSv1.2 cipher alias
X-Git-Tag: master-post-reformat~1624
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ab92fc646763364b0a9fb6b17f9759c56ccad77;p=oweals%2Fopenssl.git

add "missing" TLSv1.2 cipher alias
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 8018b5f35e..fbd0c21207 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -312,6 +312,7 @@ static const SSL_CIPHER cipher_aliases[]={
 	{0,SSL_TXT_SSLV2,0,   0,0,0,0,SSL_SSLV2, 0,0,0,0},
 	{0,SSL_TXT_SSLV3,0,   0,0,0,0,SSL_SSLV3, 0,0,0,0},
 	{0,SSL_TXT_TLSV1,0,   0,0,0,0,SSL_TLSV1, 0,0,0,0},
+	{0,SSL_TXT_TLSV1_2,0, 0,0,0,0,SSL_TLSV1_2, 0,0,0,0},
 
 	/* export flag */
 	{0,SSL_TXT_EXP,0,     0,0,0,0,0,SSL_EXPORT,0,0,0},
@@ -1151,9 +1152,9 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
 			while (	((ch >= 'A') && (ch <= 'Z')) ||
 				((ch >= '0') && (ch <= '9')) ||
 				((ch >= 'a') && (ch <= 'z')) ||
-				 (ch == '-'))
+				 (ch == '-') || (ch == '.'))
 #else
-			while (	isalnum(ch) || (ch == '-'))
+			while (	isalnum(ch) || (ch == '-') || (ch == '.'))
 #endif
 				 {
 				 ch = *(++l);