TLS extensions: use more human-friendly names

This is required to provide better output to gnutls_ext_get_name()

diff --git a/lib/ext/cert_type.c b/lib/ext/cert_type.c
index 585e3f19e20942888355103096adf2a85d5c4b36..59b2ea156143df4511dbf7f3ce533b73ff8e4a66 100644 (file)
--- a/lib/ext/cert_type.c
+++ b/lib/ext/cert_type.c
@@ -45,7 +45,7 @@ static int _gnutls_cert_type_send_params(gnutls_session_t session,
                                         gnutls_buffer_st * extdata);
 
 const extension_entry_st ext_mod_cert_type = {
-       .name = "CERT TYPE",
+       .name = "Certificate Type",
        .type = GNUTLS_EXTENSION_CERT_TYPE,
        .parse_type = GNUTLS_EXT_TLS,
 

diff --git a/lib/ext/dumbfw.c b/lib/ext/dumbfw.c
index 8c6973310f826d8c4814dfbca2dcf30d2b86a757..d48f28ecc12d8d07064ee04c0cf32ba9e13e2dc4 100644 (file)
--- a/lib/ext/dumbfw.c
+++ b/lib/ext/dumbfw.c
@@ -36,7 +36,7 @@ static int _gnutls_dumbfw_send_params(gnutls_session_t session,
                                    gnutls_buffer_st * extdata);
 
 const extension_entry_st ext_mod_dumbfw = {
-       .name = "DUMBFW",
+       .name = "ClientHello Padding",
        .type = GNUTLS_EXTENSION_DUMBFW,
        .parse_type = GNUTLS_EXT_APPLICATION,
 

diff --git a/lib/ext/ecc.c b/lib/ext/ecc.c
index ec9fc25bfb27d29c78a349f0e77cc880dcc49fb2..62ca042e1af1187179fb30158597cf8d558c8cf9 100644 (file)
--- a/lib/ext/ecc.c
+++ b/lib/ext/ecc.c
@@ -46,7 +46,7 @@ static int _gnutls_supported_ecc_pf_send_params(gnutls_session_t session,
                                                extdata);
 
 const extension_entry_st ext_mod_supported_ecc = {
-       .name = "SUPPORTED ECC",
+       .name = "Supported curves",
        .type = GNUTLS_EXTENSION_SUPPORTED_ECC,
        .parse_type = GNUTLS_EXT_TLS,
 

diff --git a/lib/ext/etm.c b/lib/ext/etm.c
index b529299b290285abe12fe76fbb33a17f4b2b95f3..8cba95912c763355ddebfee3c4df4f749312b172 100644 (file)
--- a/lib/ext/etm.c
+++ b/lib/ext/etm.c
@@ -36,7 +36,7 @@ static int _gnutls_ext_etm_send_params(gnutls_session_t session,
                                          gnutls_buffer_st * extdata);
 
 const extension_entry_st ext_mod_etm = {
-       .name = "ENCRYPT THEN MAC",
+       .name = "Encrypt-then-MAC",
        .type = GNUTLS_EXTENSION_ETM,
        .parse_type = GNUTLS_EXT_MANDATORY,
 

diff --git a/lib/ext/ext_master_secret.c b/lib/ext/ext_master_secret.c
index be4d0aecd177e0f617c4f0f6d7da02c3d0e60252..62c4cf9f542ed4e876bd301db9439302f1a0a98b 100644 (file)
--- a/lib/ext/ext_master_secret.c
+++ b/lib/ext/ext_master_secret.c
@@ -36,7 +36,7 @@ static int _gnutls_ext_master_secret_send_params(gnutls_session_t session,
                                          gnutls_buffer_st * extdata);
 
 const extension_entry_st ext_mod_ext_master_secret = {
-       .name = "EXT MASTER SECRET",
+       .name = "Extended Master Secret",
        .type = GNUTLS_EXTENSION_EXT_MASTER_SECRET,
        .parse_type = GNUTLS_EXT_MANDATORY,
 

diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c
index 77d990b9c59dd33f0e725c53735978f8a055670e..180d59ad66a29da49abab48c54c8f5ce2334de5d 100644 (file)
--- a/lib/ext/heartbeat.c
+++ b/lib/ext/heartbeat.c
@@ -520,7 +520,7 @@ _gnutls_heartbeat_unpack(gnutls_buffer_st * ps,
 }
 
 const extension_entry_st ext_mod_heartbeat = {
-       .name = "HEARTBEAT",
+       .name = "Heartbeat",
        .type = GNUTLS_EXTENSION_HEARTBEAT,
        .parse_type = GNUTLS_EXT_TLS,
 

diff --git a/lib/ext/max_record.c b/lib/ext/max_record.c
index 99b1c1b6a3e9054760135fe3285b46d31454d3f3..41880b6236a1374ca58bc463770959fc0c7ae0e5 100644 (file)
--- a/lib/ext/max_record.c
+++ b/lib/ext/max_record.c
@@ -48,7 +48,7 @@ static int _gnutls_mre_record2num(uint16_t record_size);
 
 
 const extension_entry_st ext_mod_max_record_size = {
-       .name = "MAX RECORD SIZE",
+       .name = "Maximum Record Size",
        .type = GNUTLS_EXTENSION_MAX_RECORD_SIZE,
        .parse_type = GNUTLS_EXT_TLS,
 

diff --git a/lib/ext/safe_renegotiation.c b/lib/ext/safe_renegotiation.c
index 886fdaa8e0fa4c072bf7c88c130cc8d084526004..7fe0455702b0ef43a61bcba3671fc5412206cd73 100644 (file)
--- a/lib/ext/safe_renegotiation.c
+++ b/lib/ext/safe_renegotiation.c
@@ -32,7 +32,7 @@ static int _gnutls_sr_send_params(gnutls_session_t state,
 static void _gnutls_sr_deinit_data(extension_priv_data_t priv);
 
 const extension_entry_st ext_mod_sr = {
-       .name = "SAFE RENEGOTIATION",
+       .name = "Safe Renegotiation",
        .type = GNUTLS_EXTENSION_SAFE_RENEGOTIATION,
        .parse_type = GNUTLS_EXT_MANDATORY,
 

diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c
index 62b1244cd5f4afcc984879f84c6d5b6691629f95..7a8ed7e065c73580075029c9216af57c8f1eb5db 100644 (file)
--- a/lib/ext/server_name.c
+++ b/lib/ext/server_name.c
@@ -48,7 +48,7 @@ _gnutls_server_name_set_raw(gnutls_session_t session,
                       const void *name, size_t name_length);
 
 const extension_entry_st ext_mod_server_name = {
-       .name = "SERVER NAME",
+       .name = "Server Name Indication",
        .type = GNUTLS_EXTENSION_SERVER_NAME,
        .parse_type = GNUTLS_EXT_APPLICATION,
 

diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index f23612508e97bf0908431a28101fefc48f31bd32..5a957f021dfe8a40085438e3abefb9b88e23cea8 100644 (file)
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -60,7 +60,7 @@ static int session_ticket_pack(extension_priv_data_t _priv,
 static void session_ticket_deinit_data(extension_priv_data_t priv);
 
 const extension_entry_st ext_mod_session_ticket = {
-       .name = "SESSION TICKET",
+       .name = "Session Ticket",
        .type = GNUTLS_EXTENSION_SESSION_TICKET,
        .parse_type = GNUTLS_EXT_TLS,
 

diff --git a/lib/ext/signature.c b/lib/ext/signature.c
index bb39acb3169986155c577e7a596c5e0973a36ea9..29a208e367b2b8472128e0eebe8633b219ab4f2d 100644 (file)
--- a/lib/ext/signature.c
+++ b/lib/ext/signature.c
@@ -49,7 +49,7 @@ static int signature_algorithms_unpack(gnutls_buffer_st * ps,
                                       extension_priv_data_t * _priv);
 
 const extension_entry_st ext_mod_sig = {
-       .name = "SIGNATURE ALGORITHMS",
+       .name = "Signature Algorithms",
        .type = GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS,
        .parse_type = GNUTLS_EXT_TLS,
 

diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c
index 44974010988adc3f86101c641e8782f11d2ee57d..64598a6d61643cdd9cf25f67679d112556223610 100644 (file)
--- a/lib/ext/status_request.c
+++ b/lib/ext/status_request.c
@@ -522,7 +522,7 @@ _gnutls_status_request_unpack(gnutls_buffer_st * ps,
 }
 
 const extension_entry_st ext_mod_status_request = {
-       .name = "STATUS REQUEST",
+       .name = "Status Request",
        .type = GNUTLS_EXTENSION_STATUS_REQUEST,
        .parse_type = GNUTLS_EXT_TLS,
        .recv_func = _gnutls_status_request_recv_params,