[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  ee3a6c646ff8ea6b9ada5a58f4a0e7c9b7be944b (commit)
      from  23d38992fca13773291ca647220707bfb0636361 (commit)


- Log -----------------------------------------------------------------
commit ee3a6c646ff8ea6b9ada5a58f4a0e7c9b7be944b
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Wed Mar 16 20:47:52 2016 -0400

    Report TLS 1.0 as backwards-compatible TLSv1
    
    The TLSv1.0 form is retained for reporting the first protocol version
    that supports a given cupher.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_ciph.c | 7 +++++++
 ssl/ssl_lib.c  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index aaeeb8d..c62b193 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1822,6 +1822,13 @@ const char *SSL_CIPHER_get_version(const SSL_CIPHER *c)
 {
     if (c == NULL)
         return "(NONE)";
+
+    /*
+     * Backwards-compatibility crutch.  In almost all contexts we report TLS
+     * 1.0 as "TLSv1", but for ciphers we report "TLSv1.0".
+     */
+    if (c->min_tls == TLS1_VERSION)
+        return "TLSv1.0";
     return ssl_protocol_to_string(c->min_tls);
 }
 
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index cec3fc2..87e3dfa 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3067,7 +3067,7 @@ const char *ssl_protocol_to_string(int version)
     else if (version == TLS1_1_VERSION)
         return "TLSv1.1";
     else if (version == TLS1_VERSION)
-        return "TLSv1.0";
+        return "TLSv1";
     else if (version == SSL3_VERSION)
         return "SSLv3";
     else if (version == DTLS1_BAD_VER)