extensions: separate the hello extensions from others

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/lib/ext/signature.c b/lib/ext/signature.c
index 0fb057e050fbb4202f171ab29983f379c00393f6..68b667a9602be2c8c4c197cb06516e0d3f04fb79 100644 (file)
--- a/lib/ext/signature.c
+++ b/lib/ext/signature.c
@@ -53,7 +53,7 @@ const hello_ext_entry_st ext_mod_sig = {
        .name = "Signature Algorithms",
        .tls_id = 13,
        .gid = GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS,
-       .validity = GNUTLS_EXT_FLAG_CLIENT_HELLO|GNUTLS_EXT_FLAG_CR,
+       .validity = GNUTLS_EXT_FLAG_CLIENT_HELLO,
        .parse_type = GNUTLS_EXT_TLS,
 
        .recv_func = _gnutls_signature_algorithm_recv_params,

diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c
index 7263222e75fd7c341df42e51bf51cd8ba050cbc2..19838f790d03f5bfe24e0f7ebc4be1b58a35dc33 100644 (file)
--- a/lib/ext/status_request.c
+++ b/lib/ext/status_request.c
@@ -533,7 +533,7 @@ const hello_ext_entry_st ext_mod_status_request = {
        .name = "OCSP Status Request",
        .tls_id = 5,
        .gid = GNUTLS_EXTENSION_STATUS_REQUEST,
-       .validity = GNUTLS_EXT_FLAG_CLIENT_HELLO|GNUTLS_EXT_FLAG_CT|GNUTLS_EXT_FLAG_CR|GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO,
+       .validity = GNUTLS_EXT_FLAG_CLIENT_HELLO|GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO,
        .parse_type = _GNUTLS_EXT_TLS_POST_CS,
        .recv_func = _gnutls_status_request_recv_params,
        .send_func = _gnutls_status_request_send_params,

diff --git a/lib/hello_ext.c b/lib/hello_ext.c
index 16791da95e71972911d879a225e5ad108def1881..dfb0fbba973410fe9dbcb318911bad481d72c0fe 100644 (file)
--- a/lib/hello_ext.c
+++ b/lib/hello_ext.c
@@ -726,8 +726,7 @@ gnutls_ext_register(const char *name, int id, gnutls_ext_parse_type_t parse_type
 
 #define VALIDITY_MASK (GNUTLS_EXT_FLAG_CLIENT_HELLO|GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO| \
                        GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO| \
-                       GNUTLS_EXT_FLAG_EE|GNUTLS_EXT_FLAG_CT|GNUTLS_EXT_FLAG_CR| \
-                       GNUTLS_EXT_FLAG_NST|GNUTLS_EXT_FLAG_HRR)
+                       GNUTLS_EXT_FLAG_EE|GNUTLS_EXT_FLAG_HRR)
 
 /**
  * gnutls_session_ext_register:

diff --git a/lib/hello_ext.h b/lib/hello_ext.h
index 058e56405321b6af24c7d0f8c4d61c6b27a2506e..8d986bffb1c097b648396dc1385558d007a4f075 100644 (file)
--- a/lib/hello_ext.h
+++ b/lib/hello_ext.h
@@ -68,12 +68,6 @@ inline static const char *ext_msg_validity_to_str(gnutls_ext_flags_t msg)
                        return "TLS 1.3 server hello";
                case GNUTLS_EXT_FLAG_EE:
                        return "encrypted extensions";
-               case GNUTLS_EXT_FLAG_CT:
-                       return "certificate";
-               case GNUTLS_EXT_FLAG_CR:
-                       return "certificate request";
-               case GNUTLS_EXT_FLAG_NST:
-                       return "new session ticket";
                case GNUTLS_EXT_FLAG_HRR:
                        return "hello retry request";
                default:

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 3ed7901514761b8c60326f13eab0ebffd6cfdb82..53a17fc5cd7dc4c13188eb9d56ac94acefc25b41 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -2669,9 +2669,6 @@ typedef enum {
  * @GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO: This extension can be present in a TLS1.2 or earlier server hello
  * @GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO: This extension can be present in a TLS1.3 server hello
  * @GNUTLS_EXT_FLAG_EE: This extension can be present in encrypted extensions message
- * @GNUTLS_EXT_FLAG_CT: This extension can be present in certificate message
- * @GNUTLS_EXT_FLAG_CR: This extension can be present in certificate request message
- * @GNUTLS_EXT_FLAG_NST: This extension can be present in new session ticket message
  * @GNUTLS_EXT_FLAG_HRR: This extension can be present in hello retry request message
  *
  * Enumeration of different TLS extension registration flags.
@@ -2682,10 +2679,7 @@ typedef enum {
   GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO = (1<<2),
   GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO = (1<<3),
   GNUTLS_EXT_FLAG_EE = (1<<4), /* ENCRYPTED */
-  GNUTLS_EXT_FLAG_CT = (1<<5),
-  GNUTLS_EXT_FLAG_CR = (1<<6),
-  GNUTLS_EXT_FLAG_NST = (1<<7),
-  GNUTLS_EXT_FLAG_HRR = (1<<8)
+  GNUTLS_EXT_FLAG_HRR = (1<<5)
 } gnutls_ext_flags_t;
 
 /* Register a custom tls extension