diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-11-15 20:14:47 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-11-15 20:14:47 +0100 |
| commit | 8ab92fc646763364b0a9fb6b17f9759c56ccad77 (patch) | |
| tree | 57e2d9e1f8ab65741711677c634b8e158be1fa1c /ssl | |
| parent | aes-x86_64.pl: Atom-specific optimizations, +10%. (diff) | |
| download | openssl-8ab92fc646763364b0a9fb6b17f9759c56ccad77.tar.xz openssl-8ab92fc646763364b0a9fb6b17f9759c56ccad77.zip | |
add "missing" TLSv1.2 cipher alias
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_ciph.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |