Add or clean header guards in lib/ext/

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

26 files changed, 90 insertions, 72 deletions

diff --git a/lib/ext/alpn.h b/lib/ext/alpn.h
index 8197628bd1..0b32a3292d 100644
--- a/lib/ext/alpn.h
+++ b/lib/ext/alpn.h
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  *
  */
-#ifndef EXT_ALPN_H
-#define EXT_ALPN_H
+
+#ifndef GNUTLS_LIB_EXT_ALPN_H
+#define GNUTLS_LIB_EXT_ALPN_H
 
 #include <hello_ext.h>
 
@@ -36,4 +37,4 @@ typedef struct {
 
 extern const hello_ext_entry_st ext_mod_alpn;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_ALPN_H */
diff --git a/lib/ext/cert_types.h b/lib/ext/cert_types.h
index 886f66cc45..98dfdef101 100644
--- a/lib/ext/cert_types.h
+++ b/lib/ext/cert_types.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef GNUTLS_LIB_EXT_CERT_TYPES_H
+#define GNUTLS_LIB_EXT_CERT_TYPES_H
+
 /* Maps IANA TLS Certificate Types identifiers to internal
  * certificate type representation.
  */
@@ -81,3 +84,5 @@ static inline bool are_alternative_cert_types_allowed(gnutls_session_t session)
 
 	#undef CERT_TYPES_FLAGS
 }
+
+#endif /* GNUTLS_LIB_EXT_CERT_TYPES_H */
diff --git a/lib/ext/client_cert_type.h b/lib/ext/client_cert_type.h
index fca8c7b6e9..7e89ca816a 100644
--- a/lib/ext/client_cert_type.h
+++ b/lib/ext/client_cert_type.h
@@ -26,11 +26,11 @@
  * when requested using a certificate_request message.
  */
 
-#ifndef EXT_CLIENT_CERT_TYPE_H
-#define EXT_CLIENT_CERT_TYPE_H
+#ifndef GNUTLS_LIB_EXT_CLIENT_CERT_TYPE_H
+#define GNUTLS_LIB_EXT_CLIENT_CERT_TYPE_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_client_cert_type;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_CLIENT_CERT_TYPE_H */
diff --git a/lib/ext/cookie.h b/lib/ext/cookie.h
index 453fcd00bd..13ea7c7cde 100644
--- a/lib/ext/cookie.h
+++ b/lib/ext/cookie.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_COOKIE_H
-#define EXT_COOKIE_H
+#ifndef GNUTLS_LIB_EXT_COOKIE_H
+#define GNUTLS_LIB_EXT_COOKIE_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_cookie;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_COOKIE_H */
diff --git a/lib/ext/dumbfw.h b/lib/ext/dumbfw.h
index 45665eb85b..87bb072e9f 100644
--- a/lib/ext/dumbfw.h
+++ b/lib/ext/dumbfw.h
@@ -17,11 +17,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  *
  */
-#ifndef EXT_DUMBFW_H
-#define EXT_DUMBFW_H
+
+#ifndef GNUTLS_LIB_EXT_DUMBFW_H
+#define GNUTLS_LIB_EXT_DUMBFW_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_dumbfw;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_DUMBFW_H */
diff --git a/lib/ext/early_data.h b/lib/ext/early_data.h
index d767f7e2f5..d7178e8ac2 100644
--- a/lib/ext/early_data.h
+++ b/lib/ext/early_data.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_EARLY_DATA_H
-#define EXT_EARLY_DATA_H
+#ifndef GNUTLS_LIB_EXT_EARLY_DATA_H
+#define GNUTLS_LIB_EXT_EARLY_DATA_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_early_data;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_EARLY_DATA_H */
diff --git a/lib/ext/ec_point_formats.h b/lib/ext/ec_point_formats.h
index fb58a8fa5d..cc65c04c38 100644
--- a/lib/ext/ec_point_formats.h
+++ b/lib/ext/ec_point_formats.h
@@ -19,11 +19,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  *
  */
-#ifndef EXT_EC_POINT_FORMATS_H
-#define EXT_EC_POINT_FORMATS_H
+
+#ifndef GNUTLS_LIB_EXT_EC_POINT_FORMATS_H
+#define GNUTLS_LIB_EXT_EC_POINT_FORMATS_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_supported_ec_point_formats;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_EC_POINT_FORMATS_H */
diff --git a/lib/ext/etm.h b/lib/ext/etm.h
index 82d042574a..76f9dd5e51 100644
--- a/lib/ext/etm.h
+++ b/lib/ext/etm.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_ETM_H
-#define EXT_ETM_H
+#ifndef GNUTLS_LIB_EXT_ETM_H
+#define GNUTLS_LIB_EXT_ETM_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_etm;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_ETM_H */
diff --git a/lib/ext/ext_master_secret.h b/lib/ext/ext_master_secret.h
index 3b40734854..419335b4e3 100644
--- a/lib/ext/ext_master_secret.h
+++ b/lib/ext/ext_master_secret.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_EXT_MASTER_SECRET_H
-#define EXT_EXT_MASTER_SECRET_H
+#ifndef GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
+#define GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_ext_master_secret;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H */
diff --git a/lib/ext/heartbeat.h b/lib/ext/heartbeat.h
index 5baa5e8c51..1a210040f5 100644
--- a/lib/ext/heartbeat.h
+++ b/lib/ext/heartbeat.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef EXT_HEARTBEAT_H
-#define EXT_HEARTBEAT_H
+#ifndef GNUTLS_LIB_EXT_HEARTBEAT_H
+#define GNUTLS_LIB_EXT_HEARTBEAT_H
 
 #include <hello_ext.h>
 
@@ -40,4 +40,5 @@ extern const hello_ext_entry_st ext_mod_heartbeat;
 
 int _gnutls_heartbeat_handle(gnutls_session_t session, mbuffer_st * bufel);
 int _gnutls_heartbeat_enabled(gnutls_session_t session, int local);
-#endif
+
+#endif /* GNUTLS_LIB_EXT_HEARTBEAT_H */
diff --git a/lib/ext/key_share.h b/lib/ext/key_share.h
index f5d775da8a..ed9aa16800 100644
--- a/lib/ext/key_share.h
+++ b/lib/ext/key_share.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_KEY_SHARE_H
-#define EXT_KEY_SHARE_H
+#ifndef GNUTLS_LIB_EXT_KEY_SHARE_H
+#define GNUTLS_LIB_EXT_KEY_SHARE_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_key_share;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_KEY_SHARE_H */
diff --git a/lib/ext/max_record.h b/lib/ext/max_record.h
index 553a37e4fc..758c8e12c8 100644
--- a/lib/ext/max_record.h
+++ b/lib/ext/max_record.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_MAX_RECORD_H
-#define EXT_MAX_RECORD_H
+#ifndef GNUTLS_LIB_EXT_MAX_RECORD_H
+#define GNUTLS_LIB_EXT_MAX_RECORD_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_max_record_size;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_MAX_RECORD_H */
diff --git a/lib/ext/post_handshake.h b/lib/ext/post_handshake.h
index a2ac0419c4..7a1cc7a367 100644
--- a/lib/ext/post_handshake.h
+++ b/lib/ext/post_handshake.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_POST_HANDSHAKE_H
-#define EXT_POST_HANDSHAKE_H
+#ifndef GNUTLS_LIB_EXT_POST_HANDSHAKE_H
+#define GNUTLS_LIB_EXT_POST_HANDSHAKE_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_post_handshake;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_POST_HANDSHAKE_H */
diff --git a/lib/ext/pre_shared_key.h b/lib/ext/pre_shared_key.h
index 71116e5d10..f1ea62c9ce 100644
--- a/lib/ext/pre_shared_key.h
+++ b/lib/ext/pre_shared_key.h
@@ -1,5 +1,5 @@
-#ifndef EXT_PRE_SHARED_KEY_H
-#define EXT_PRE_SHARED_KEY_H
+#ifndef GNUTLS_LIB_EXT_PRE_SHARED_KEY_H
+#define GNUTLS_LIB_EXT_PRE_SHARED_KEY_H
 
 #include "auth/psk.h"
 #include <hello_ext.h>
@@ -20,4 +20,4 @@ unsigned _gnutls_have_psk_credentials(const gnutls_psk_client_credentials_t cred
 
 int _gnutls_generate_early_secrets_for_psk(gnutls_session_t session);
 
-#endif
+#endif /* GNUTLS_LIB_EXT_PRE_SHARED_KEY_H */
diff --git a/lib/ext/psk_ke_modes.h b/lib/ext/psk_ke_modes.h
index 82c2c10bba..56876a97d8 100644
--- a/lib/ext/psk_ke_modes.h
+++ b/lib/ext/psk_ke_modes.h
@@ -1,8 +1,8 @@
-#ifndef EXT_PSK_KE_MODES_H
-#define EXT_PSK_KE_MODES_H
+#ifndef GNUTLS_LIB_EXT_PSK_KE_MODES_H
+#define GNUTLS_LIB_EXT_PSK_KE_MODES_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_psk_ke_modes;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_PSK_KE_MODES_H */
diff --git a/lib/ext/record_size_limit.h b/lib/ext/record_size_limit.h
index 30c340c1ba..da7cade58d 100644
--- a/lib/ext/record_size_limit.h
+++ b/lib/ext/record_size_limit.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_RECORD_SIZE_LIMIT_H
-#define EXT_RECORD_SIZE_LIMIT_H
+#ifndef GNUTLS_LIB_EXT_RECORD_SIZE_LIMIT_H
+#define GNUTLS_LIB_EXT_RECORD_SIZE_LIMIT_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_record_size_limit;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_RECORD_SIZE_LIMIT_H */
diff --git a/lib/ext/safe_renegotiation.h b/lib/ext/safe_renegotiation.h
index 0b87f2b672..bc2024a9fc 100644
--- a/lib/ext/safe_renegotiation.h
+++ b/lib/ext/safe_renegotiation.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef EXT_SAFE_RENEGOTIATION_H
-#define EXT_SAFE_RENEGOTIATION_H
+#ifndef GNUTLS_LIB_EXT_SAFE_RENEGOTIATION_H
+#define GNUTLS_LIB_EXT_SAFE_RENEGOTIATION_H
 
 #include <hello_ext.h>
 
@@ -46,4 +46,4 @@ int _gnutls_ext_sr_recv_cs(gnutls_session_t session);
 int _gnutls_ext_sr_verify(gnutls_session_t session);
 int _gnutls_ext_sr_send_cs(gnutls_session_t);
 
-#endif				/* EXT_SAFE_RENEGOTIATION_H */
+#endif /* GNUTLS_LIB_EXT_SAFE_RENEGOTIATION_H */
diff --git a/lib/ext/server_cert_type.h b/lib/ext/server_cert_type.h
index e60480f3a8..3c15b0b7b8 100644
--- a/lib/ext/server_cert_type.h
+++ b/lib/ext/server_cert_type.h
@@ -26,11 +26,11 @@
  * in order to authenticate the server.
  */
 
-#ifndef EXT_SERVER_CERT_TYPE_H
-#define EXT_SERVER_CERT_TYPE_H
+#ifndef GNUTLS_LIB_EXT_SERVER_CERT_TYPE_H
+#define GNUTLS_LIB_EXT_SERVER_CERT_TYPE_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_server_cert_type;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_SERVER_CERT_TYPE_H */
diff --git a/lib/ext/server_name.h b/lib/ext/server_name.h
index 8c12b2ee8b..b5cdd0ea53 100644
--- a/lib/ext/server_name.h
+++ b/lib/ext/server_name.h
@@ -20,8 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  *
  */
-#ifndef EXT_SERVER_NAME_H
-#define EXT_SERVER_NAME_H
+
+#ifndef GNUTLS_LIB_EXT_SERVER_NAME_H
+#define GNUTLS_LIB_EXT_SERVER_NAME_H
 
 #include <hello_ext.h>
 
@@ -29,4 +30,4 @@ extern const hello_ext_entry_st ext_mod_server_name;
 
 unsigned _gnutls_server_name_matches_resumed(gnutls_session_t);
 
-#endif
+#endif /* GNUTLS_LIB_EXT_SERVER_NAME_H */
diff --git a/lib/ext/session_ticket.h b/lib/ext/session_ticket.h
index a0c687aa73..da804ec2f7 100644
--- a/lib/ext/session_ticket.h
+++ b/lib/ext/session_ticket.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef EXT_SESSION_TICKET_H
-#define EXT_SESSION_TICKET_H
+#ifndef GNUTLS_LIB_EXT_SESSION_TICKET_H
+#define GNUTLS_LIB_EXT_SESSION_TICKET_H
 
 #include <hello_ext.h>
 
@@ -37,4 +37,4 @@ int _gnutls_decrypt_session_ticket(gnutls_session_t session,
 				   const gnutls_datum_t *ticket_data,
 				   gnutls_datum_t *state);
 
-#endif
+#endif /* GNUTLS_LIB_EXT_SESSION_TICKET_H */
diff --git a/lib/ext/signature.h b/lib/ext/signature.h
index 28e8966b1c..a6448f34b6 100644
--- a/lib/ext/signature.h
+++ b/lib/ext/signature.h
@@ -20,10 +20,11 @@
  *
  */
 
+#ifndef GNUTLS_LIB_EXT_SIGNATURE_H
+#define GNUTLS_LIB_EXT_SIGNATURE_H
+
 /* signature algorithms extension
  */
-#ifndef EXT_SIGNATURE_H
-#define EXT_SIGNATURE_H
 
 #include <hello_ext.h>
 
@@ -55,4 +56,5 @@ gnutls_sign_algorithm_set_client(gnutls_session_t session,
 {
 	session->security_parameters.client_sign_algo = sign;
 }
-#endif
+
+#endif /* GNUTLS_LIB_EXT_SIGNATURE_H */
diff --git a/lib/ext/srp.h b/lib/ext/srp.h
index f70441c17c..fd7576fef7 100644
--- a/lib/ext/srp.h
+++ b/lib/ext/srp.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef EXT_SRP_H
-#define EXT_SRP_H
+#ifndef GNUTLS_LIB_EXT_SRP_H
+#define GNUTLS_LIB_EXT_SRP_H
 
 #include <hello_ext.h>
 
@@ -39,4 +39,4 @@ typedef struct {
 
 #endif
 
-#endif
+#endif /* GNUTLS_LIB_EXT_SRP_H */
diff --git a/lib/ext/srtp.h b/lib/ext/srtp.h
index 327f181ee8..d05454a477 100644
--- a/lib/ext/srtp.h
+++ b/lib/ext/srtp.h
@@ -19,6 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  *
  */
+
+#ifndef GNUTLS_LIB_EXT_SRTP_H
+#define GNUTLS_LIB_EXT_SRTP_H
 #ifndef EXT_SRTP_H
 #define EXT_SRTP_H
 
@@ -38,3 +41,5 @@ typedef struct {
 extern const hello_ext_entry_st ext_mod_srtp;
 
 #endif
+
+#endif /* GNUTLS_LIB_EXT_SRTP_H */
diff --git a/lib/ext/status_request.h b/lib/ext/status_request.h
index a2d9c7969f..dc1d233ea2 100644
--- a/lib/ext/status_request.h
+++ b/lib/ext/status_request.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef EXT_STATUS_REQUEST_H
-#define EXT_STATUS_REQUEST_H
+#ifndef GNUTLS_LIB_EXT_STATUS_REQUEST_H
+#define GNUTLS_LIB_EXT_STATUS_REQUEST_H
 
 #include <hello_ext.h>
 
@@ -38,4 +38,4 @@ int _gnutls_parse_ocsp_response(gnutls_session_t session, const uint8_t *data,
 				ssize_t data_size,
 				gnutls_datum_t *resp);
 
-#endif
+#endif /* GNUTLS_LIB_EXT_STATUS_REQUEST_H */
diff --git a/lib/ext/supported_groups.h b/lib/ext/supported_groups.h
index c75367f877..769b3be8e1 100644
--- a/lib/ext/supported_groups.h
+++ b/lib/ext/supported_groups.h
@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  *
  */
-#ifndef EXT_SUPPORTED_GROUPS_H
-#define EXT_SUPPORTED_GROUPS_H
+
+#ifndef GNUTLS_LIB_EXT_SUPPORTED_GROUPS_H
+#define GNUTLS_LIB_EXT_SUPPORTED_GROUPS_H
 
 #include <hello_ext.h>
 
@@ -30,4 +31,4 @@ int
 _gnutls_session_supports_group(gnutls_session_t session,
 				unsigned int group);
 
-#endif
+#endif /* GNUTLS_LIB_EXT_SUPPORTED_GROUPS_H */
diff --git a/lib/ext/supported_versions.h b/lib/ext/supported_versions.h
index 68f9b8b436..f7dfb9ebb9 100644
--- a/lib/ext/supported_versions.h
+++ b/lib/ext/supported_versions.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef EXT_SUPPORTED_VERSIONS_H
-#define EXT_SUPPORTED_VERSIONS_H
+#ifndef GNUTLS_LIB_EXT_SUPPORTED_VERSIONS_H
+#define GNUTLS_LIB_EXT_SUPPORTED_VERSIONS_H
 
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_supported_versions;
 
-#endif
+#endif /* GNUTLS_LIB_EXT_SUPPORTED_VERSIONS_H */