From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 3 Mar 2015 15:39:26 +0000 (+0000)
Subject: Add DTLS to SSL_get_version
X-Git-Tag: OpenSSL_1_0_2b~166
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3edf1b98e0b713f1655341572e2ac878a2e553f6;p=oweals%2Fopenssl.git

Add DTLS to SSL_get_version

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 504e643e0996fb842ac183023c3a6b9049af50ea)

Conflicts:
	ssl/ssl_lib.c
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index e9ad2bc81b..38426b4f9c 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2832,6 +2832,12 @@ const char *SSL_get_version(const SSL *s)
         return ("SSLv3");
     else if (s->version == SSL2_VERSION)
         return ("SSLv2");
+    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");
     else
         return ("unknown");
 }