From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 24 May 2023 07:02:26 +0000 (+0200)
Subject: .gitlab-ci.yml: pull in clang16-extra-tools instead of clang15-*
X-Git-Tag: 3.8.1~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e319af06504fccdf3e5d851fec7fc7cfe78490af;p=thirdparty%2Fgnutls.git

.gitlab-ci.yml: pull in clang16-extra-tools instead of clang15-*

Also re-indent the existing code with the newer version of clang.

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cad9f73ba4..4957fd5a03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,7 +167,7 @@ commit-check:
   cache: {}
   script:
     # we want $ALPINE_BASE_BUILD without git, so we are adding it here
-    - apk add git bash grep clang15-extra-tools
+    - apk add git bash grep clang16-extra-tools
     - devel/check_if_signed
     - devel/indent-gnutls
     - git diff --exit-code # nothing should change version controlled files
diff --git a/lib/accelerated/aarch64/aarch64-common.h b/lib/accelerated/aarch64/aarch64-common.h
index f47d09513f..78e08f3fe4 100644
--- a/lib/accelerated/aarch64/aarch64-common.h
+++ b/lib/accelerated/aarch64/aarch64-common.h
@@ -26,7 +26,7 @@
 #if !__ASSEMBLER__
 #define NN_HASH(name, update_func, digest_func, NAME)                 \
 	{                                                             \
-#name, sizeof(struct name##_ctx), NAME##_DIGEST_SIZE, \
+		#name, sizeof(struct name##_ctx), NAME##_DIGEST_SIZE, \
 			NAME##_DATA_SIZE,                             \
 			(nettle_hash_init_func *)name##_init,         \
 			(nettle_hash_update_func *)update_func,       \
diff --git a/lib/accelerated/x86/x86-common.h b/lib/accelerated/x86/x86-common.h
index 97d984677c..e3819ec59a 100644
--- a/lib/accelerated/x86/x86-common.h
+++ b/lib/accelerated/x86/x86-common.h
@@ -37,7 +37,7 @@ void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
 
 #define NN_HASH(name, update_func, digest_func, NAME)                 \
 	{                                                             \
-#name, sizeof(struct name##_ctx), NAME##_DIGEST_SIZE, \
+		#name, sizeof(struct name##_ctx), NAME##_DIGEST_SIZE, \
 			NAME##_DATA_SIZE,                             \
 			(nettle_hash_init_func *)name##_init,         \
 			(nettle_hash_update_func *)update_func,       \
diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 8e702ce6d9..0620735333 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -40,20 +40,20 @@
 #define ENTRY(name, canonical_name, block_algorithm, kx_algorithm,          \
 	      mac_algorithm, min_version, dtls_version)                     \
 	{                                                                   \
-#name, name, canonical_name, block_algorithm, kx_algorithm, \
+		#name, name, canonical_name, block_algorithm, kx_algorithm, \
 			mac_algorithm, min_version, GNUTLS_TLS1_2,          \
 			dtls_version, GNUTLS_DTLS1_2, GNUTLS_MAC_SHA256     \
 	}
 #define ENTRY_PRF(name, canonical_name, block_algorithm, kx_algorithm,      \
 		  mac_algorithm, min_version, dtls_version, prf)            \
 	{                                                                   \
-#name, name, canonical_name, block_algorithm, kx_algorithm, \
+		#name, name, canonical_name, block_algorithm, kx_algorithm, \
 			mac_algorithm, min_version, GNUTLS_TLS1_2,          \
 			dtls_version, GNUTLS_DTLS1_2, prf                   \
 	}
 #define ENTRY_TLS13(name, canonical_name, block_algorithm, min_version, prf) \
 	{                                                                    \
-#name, name, canonical_name, block_algorithm, 0,             \
+		#name, name, canonical_name, block_algorithm, 0,             \
 			GNUTLS_MAC_AEAD, min_version, GNUTLS_TLS1_3,         \
 			GNUTLS_VERSION_UNKNOWN, GNUTLS_VERSION_UNKNOWN, prf  \
 	}