From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 30 May 2016 08:45:46 +0000 (+0200)
Subject: x509/output: print the extension name of TLSFeatures
X-Git-Tag: gnutls_3_5_1~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f3e79ce32a0a8331ece98bc4791c5b35cfa8a29;p=thirdparty%2Fgnutls.git

x509/output: print the extension name of TLSFeatures
---

diff --git a/lib/extensions.c b/lib/extensions.c
index b498e5efb0..a2bc732e88 100644
--- a/lib/extensions.c
+++ b/lib/extensions.c
@@ -136,7 +136,7 @@ static gnutls_ext_unpack_func _gnutls_ext_func_unpack(uint16_t type)
 }
 
 
-static const char *_gnutls_extension_get_name(uint16_t type)
+const char *_gnutls_extension_get_name(uint16_t type)
 {
 	size_t i;
 
diff --git a/lib/extensions.h b/lib/extensions.h
index 7ef1b64782..bd78c2e069 100644
--- a/lib/extensions.h
+++ b/lib/extensions.h
@@ -88,4 +88,6 @@ typedef struct {
 
 int _gnutls_ext_register(extension_entry_st *);
 
+const char *_gnutls_extension_get_name(uint16_t type);
+
 #endif
diff --git a/lib/x509/output.c b/lib/x509/output.c
index e63ca2d6d3..9258225e82 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -33,6 +33,7 @@
 #include <extras/randomart.h>
 #include <c-ctype.h>
 #include <gnutls-idna.h>
+#include "extensions.h"
 
 #ifdef HAVE_INET_NTOP
 # include <arpa/inet.h>
@@ -885,6 +886,7 @@ static void print_tlsfeatures(gnutls_buffer_st * str, const char *prefix, const
 	int err;
 	int seq;
 	gnutls_x509_tlsfeatures_t features;
+	const char *name;
 	unsigned int feature;
 
 	err = gnutls_x509_tlsfeatures_init(&features);
@@ -908,7 +910,11 @@ static void print_tlsfeatures(gnutls_buffer_st * str, const char *prefix, const
 			goto cleanup;
 		}
 
-		addf(str, "%s\t\t\t%u\n", prefix, feature);
+		name = _gnutls_extension_get_name(feature);
+		if (name == NULL)
+			addf(str, "%s\t\t\t%u\n", prefix, feature);
+		else
+			addf(str, "%s\t\t\t%s(%u)\n", prefix, name, feature);
 	}
 
 cleanup: