.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 cad9f73ba4a28c747a4e0bd412ffca43d8be4bd9..4957fd5a039c0534174a5ca4f7172c1e95ae4b4f 100644 (file)
--- 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 f47d09513f54f32220d8cb96cf3e97c03cc39d68..78e08f3fe4941d07202ea524e1d77b38bcfd51d1 100644 (file)
--- 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 97d984677ca65dd6b9ef1b574fdd4a69db6582b2..e3819ec59afa1dce870b3878bf9634cfa6e32e4e 100644 (file)
--- 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 8e702ce6d977b876ac9deec5b58893faef20cc9c..0620735333a76829dcf9f6d24fea69e810220945 100644 (file)
--- 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  \
        }