Commit 7d650072 authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Make function to convert version to string 



Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>

MR: #1595
parent e4646a89

ssl/ssl_lib.c

+21 −16
Original line number Diff line number Diff line
@@ -3060,26 +3060,31 @@ SSL_METHOD *ssl_bad_method(int ver) 
    return (NULL);

}



const char *SSL_get_version(const SSL *s)

{

    if (s->version == TLS1_2_VERSION)

        return ("TLSv1.2");

    else if (s->version == TLS1_1_VERSION)

        return ("TLSv1.1");

    else if (s->version == TLS1_VERSION)

        return ("TLSv1");

    else if (s->version == SSL3_VERSION)

        return ("SSLv3");

    else if (s->version == DTLS1_BAD_VER)

        return ("DTLSv0.9");

    else if (s->version == DTLS1_VERSION)

        return ("DTLSv1");

    else if (s->version == DTLS1_2_VERSION)

        return ("DTLSv1.2");

const char *version_to_string(int version)

{

    if (version == TLS1_2_VERSION)

        return "TLSv1.2";

    else if (version == TLS1_1_VERSION)

        return "TLSv1.1";

    else if (version == TLS1_VERSION)

        return "TLSv1.0";

    else if (version == SSL3_VERSION)

        return "SSLv3";

    else if (version == DTLS1_BAD_VER)

        return "DTLSv0.9";

    else if (version == DTLS1_VERSION)

        return "DTLSv1";

    else if (version == DTLS1_2_VERSION)

        return "DTLSv1.2";

    else

        return ("unknown");

}



const char *SSL_get_version(const SSL *s)

{

    return version_to_string(s->version);

}



SSL *SSL_dup(SSL *s)

{

    STACK_OF(X509_NAME) *sk;

ssl/ssl_locl.h

+2 −0
Original line number Diff line number Diff line
@@ -1871,6 +1871,8 @@ struct openssl_ssl_test_functions { 
# endif

};



const char *version_to_string(int version);



# ifndef OPENSSL_UNIT_TEST



void ssl_clear_cipher_ctx(SSL *s);

ssl/ssl_txt.c

+1 −16
Original line number Diff line number Diff line
@@ -111,22 +111,7 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) 
        goto err;

    if (BIO_puts(bp, "SSL-Session:\n") <= 0)

        goto err;

    if (x->ssl_version == SSL3_VERSION)

        s = "SSLv3";

    else if (x->ssl_version == TLS1_2_VERSION)

        s = "TLSv1.2";

    else if (x->ssl_version == TLS1_1_VERSION)

        s = "TLSv1.1";

    else if (x->ssl_version == TLS1_VERSION)

        s = "TLSv1";

    else if (x->ssl_version == DTLS1_VERSION)

        s = "DTLSv1";

    else if (x->ssl_version == DTLS1_2_VERSION)

        s = "DTLSv1.2";

    else if (x->ssl_version == DTLS1_BAD_VER)

        s = "DTLSv1-bad";

    else

        s = "unknown";

    s = version_to_string(x->ssl_version);

    if (BIO_printf(bp, "    Protocol  : %s\n", s) <= 0)

        goto err;