Commit ee3a6c64 authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent 23d38992

ssl/ssl_ciph.c

+7 −0
Original line number Diff line number Diff line
@@ -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);

}

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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)