From 22bdba28b71c09214f452720a415e2c71de26e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Sun, 28 Apr 2019 11:55:37 +0200
Subject: Add or clean header guards in lib/auth/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
---
 lib/auth/anon.h       | 5 +++++
 lib/auth/cert.h       | 7 ++++---
 lib/auth/dh_common.h  | 6 +++---
 lib/auth/ecdhe.h      | 6 +++---
 lib/auth/psk.h        | 6 +++---
 lib/auth/psk_passwd.h | 5 +++++
 lib/auth/rsa_common.h | 6 +++---
 lib/auth/srp_kx.h     | 6 +++---
 lib/auth/srp_passwd.h | 5 +++++
 9 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/lib/auth/anon.h b/lib/auth/anon.h
index 3f4a5112df..3a8db4b5b3 100644
--- a/lib/auth/anon.h
+++ b/lib/auth/anon.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef GNUTLS_LIB_AUTH_ANON_H
+#define GNUTLS_LIB_AUTH_ANON_H
+
 /* this is not to be included by gnutls_anon.c */
 #include <auth.h>
 #include <auth/dh_common.h>
@@ -45,3 +48,5 @@ typedef struct anon_auth_info_st {
 } *anon_auth_info_t;
 
 typedef struct anon_auth_info_st anon_auth_info_st;
+
+#endif /* GNUTLS_LIB_AUTH_ANON_H */
diff --git a/lib/auth/cert.h b/lib/auth/cert.h
index c494975fa7..4499320865 100644
--- a/lib/auth/cert.h
+++ b/lib/auth/cert.h
@@ -21,8 +21,9 @@
  *
  */
 
-#ifndef AUTH_CERT_H
-#define AUTH_CERT_H
+#ifndef GNUTLS_LIB_AUTH_CERT_H
+#define GNUTLS_LIB_AUTH_CERT_H
+
 #include "auth.h"
 #include <auth/dh_common.h>
 #include <x509/x509_int.h>
@@ -181,4 +182,4 @@ inline static unsigned get_key_usage(gnutls_session_t session, gnutls_pubkey_t p
 		return pubkey->key_usage;
 }
 
-#endif
+#endif /* GNUTLS_LIB_AUTH_CERT_H */
diff --git a/lib/auth/dh_common.h b/lib/auth/dh_common.h
index a87d2034af..7584f89cf7 100644
--- a/lib/auth/dh_common.h
+++ b/lib/auth/dh_common.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef AUTH_DH_COMMON
-#define AUTH_DH_COMMON
+#ifndef GNUTLS_LIB_AUTH_DH_COMMON_H
+#define GNUTLS_LIB_AUTH_DH_COMMON_H
 
 #include <auth.h>
 
@@ -47,4 +47,4 @@ int _gnutls_dh_common_print_server_kx(gnutls_session_t,
 int _gnutls_proc_dh_common_server_kx(gnutls_session_t session,
 				     uint8_t * data, size_t _data_size);
 
-#endif
+#endif /* GNUTLS_LIB_AUTH_DH_COMMON_H */
diff --git a/lib/auth/ecdhe.h b/lib/auth/ecdhe.h
index d558abfb73..e80e1ba25a 100644
--- a/lib/auth/ecdhe.h
+++ b/lib/auth/ecdhe.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef AUTH_ECDH_COMMON
-#define AUTH_ECDH_COMMON
+#ifndef GNUTLS_LIB_AUTH_ECDHE_H
+#define GNUTLS_LIB_AUTH_ECDHE_H
 
 #include <auth.h>
 
@@ -49,4 +49,4 @@ int _gnutls_proc_ecdh_common_server_kx(gnutls_session_t session,
 
 
 
-#endif
+#endif /* GNUTLS_LIB_AUTH_ECDHE_H */
diff --git a/lib/auth/psk.h b/lib/auth/psk.h
index 8b4a908a1a..1592035bb1 100644
--- a/lib/auth/psk.h
+++ b/lib/auth/psk.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef AUTH_PSK_H
-#define AUTH_PSK_H
+#ifndef GNUTLS_LIB_AUTH_PSK_H
+#define GNUTLS_LIB_AUTH_PSK_H
 
 #include <auth.h>
 #include <auth/dh_common.h>
@@ -79,4 +79,4 @@ int _gnutls_gen_psk_client_kx(gnutls_session_t, gnutls_buffer_st *);
 #define _gnutls_set_psk_session_key(x,y,z) GNUTLS_E_UNIMPLEMENTED_FEATURE
 #endif				/* ENABLE_PSK */
 
-#endif
+#endif /* GNUTLS_LIB_AUTH_PSK_H */
diff --git a/lib/auth/psk_passwd.h b/lib/auth/psk_passwd.h
index 4fb29f5070..da4c90c064 100644
--- a/lib/auth/psk_passwd.h
+++ b/lib/auth/psk_passwd.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef GNUTLS_LIB_AUTH_PSK_PASSWD_H
+#define GNUTLS_LIB_AUTH_PSK_PASSWD_H
+
 /* this is locally allocated. It should be freed using the provided function */
 int _gnutls_psk_pwd_find_entry(gnutls_session_t, char *username,
 			       gnutls_datum_t * key);
@@ -28,3 +31,5 @@ int _gnutls_find_psk_key(gnutls_session_t session,
 			 gnutls_psk_client_credentials_t cred,
 			 gnutls_datum_t * username, gnutls_datum_t * key,
 			 int *free);
+
+#endif /* GNUTLS_LIB_AUTH_PSK_PASSWD_H */
diff --git a/lib/auth/rsa_common.h b/lib/auth/rsa_common.h
index 60cd503726..d91448bec0 100644
--- a/lib/auth/rsa_common.h
+++ b/lib/auth/rsa_common.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef AUTH_RSA_COMMON
-#define AUTH_RSA_COMMON
+#ifndef GNUTLS_LIB_AUTH_RSA_COMMON_H
+#define GNUTLS_LIB_AUTH_RSA_COMMON_H
 
 #include <abstract_int.h>
 
@@ -36,4 +36,4 @@ int
 _gnutls_get_public_rsa_params(gnutls_session_t session,
 			      gnutls_pk_params_st * params);
 
-#endif
+#endif /* GNUTLS_LIB_AUTH_RSA_COMMON_H */
diff --git a/lib/auth/srp_kx.h b/lib/auth/srp_kx.h
index 9c54be066e..e4431ee28e 100644
--- a/lib/auth/srp_kx.h
+++ b/lib/auth/srp_kx.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef AUTH_SRP_H
-#define AUTH_SRP_H
+#ifndef GNUTLS_LIB_AUTH_SRP_KX_H
+#define GNUTLS_LIB_AUTH_SRP_KX_H
 
 #include <auth.h>
 
@@ -68,4 +68,4 @@ typedef struct srp_server_auth_info_st srp_server_auth_info_st;
 
 #endif				/* ENABLE_SRP */
 
-#endif
+#endif /* GNUTLS_LIB_AUTH_SRP_KX_H */
diff --git a/lib/auth/srp_passwd.h b/lib/auth/srp_passwd.h
index 317e8bfac3..56ecec2ffe 100644
--- a/lib/auth/srp_passwd.h
+++ b/lib/auth/srp_passwd.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef GNUTLS_LIB_AUTH_SRP_PASSWD_H
+#define GNUTLS_LIB_AUTH_SRP_PASSWD_H
+
 #ifdef ENABLE_SRP
 
 typedef struct {
@@ -39,3 +42,5 @@ int _gnutls_sbase64_decode(char *data, size_t data_size,
 			   uint8_t ** result);
 
 #endif				/* ENABLE_SRP */
+
+#endif /* GNUTLS_LIB_AUTH_SRP_PASSWD_H */
-- 
cgit v1.2.1