From 7e58d56f7a655feae6127c5fb15e4042012d02f5 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 12 Jul 2014 19:45:53 +0000
Subject: Provide ssl_version_string() function, which uses one of those modern
 C constructs (a switch statement) and returns the appropriate string defined
 by SSL_TXT_* for the given version, including support for DTLSv1 and
 DTLSv1-bad. Use this function in SSL_get_version() and SSL_SESSION_print().

ok beck@
---
 src/lib/libssl/ssl_lib.c | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'src/lib/libssl/ssl_lib.c')

diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index db310de881..b563071cda 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.76 2014/07/12 16:03:37 miod Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.77 2014/07/12 19:45:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2409,19 +2409,31 @@ ssl_bad_method(int ver)
 	return (NULL);
 }
 
+const char *
+ssl_version_string(int ver)
+{
+	switch (ver) {
+	case DTLS1_BAD_VER:
+		return (SSL_TXT_DTLS1_BAD);
+	case DTLS1_VERSION:
+		return (SSL_TXT_DTLS1);
+	case SSL3_VERSION:
+		return (SSL_TXT_SSLV3);
+	case TLS1_VERSION:
+		return (SSL_TXT_TLSV1);
+	case TLS1_1_VERSION:
+		return (SSL_TXT_TLSV1_1);
+	case TLS1_2_VERSION:
+		return (SSL_TXT_TLSV1_2);
+	default:
+		return ("unknown");
+	}
+}
+
 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
-		return ("unknown");
+	return ssl_version_string(s->version);
 }
 
 SSL *
-- 
cgit v1.2.3-55-g6feb