diff --git a/lib/crypto/gkdi.c b/lib/crypto/gkdi.c index 6799dcfd70e..e2167946202 100644 --- a/lib/crypto/gkdi.c +++ b/lib/crypto/gkdi.c @@ -164,13 +164,12 @@ out: return status; } -static NTSTATUS compute_l1_seed_key( - TALLOC_CTX *mem_ctx, - struct GkdiContext *ctx, - const DATA_BLOB security_descriptor, - const struct ProvRootKey *const root_key, - const struct Gkid gkid, - uint8_t key[static const GKDI_KEY_LEN]) +static NTSTATUS compute_l1_seed_key(TALLOC_CTX *mem_ctx, + struct GkdiContext *ctx, + const DATA_BLOB security_descriptor, + const struct ProvRootKey *const root_key, + const struct Gkid gkid, + uint8_t key[static const GKDI_KEY_LEN]) { NTSTATUS status = NT_STATUS_OK; struct GkdiContextShort short_ctx; @@ -350,12 +349,11 @@ static bool gkid_is_valid(const struct Gkid gkid) return true; } -NTSTATUS compute_seed_key( - TALLOC_CTX *mem_ctx, - const DATA_BLOB target_security_descriptor, - const struct ProvRootKey *const root_key, - const struct Gkid gkid, - uint8_t key[static const GKDI_KEY_LEN]) +NTSTATUS compute_seed_key(TALLOC_CTX *mem_ctx, + const DATA_BLOB target_security_descriptor, + const struct ProvRootKey *const root_key, + const struct Gkid gkid, + uint8_t key[static const GKDI_KEY_LEN]) { NTSTATUS status = NT_STATUS_OK; enum GkidType gkid_type; diff --git a/lib/crypto/gkdi.h b/lib/crypto/gkdi.h index 892bcc4b380..748e9aee9c2 100644 --- a/lib/crypto/gkdi.h +++ b/lib/crypto/gkdi.h @@ -89,11 +89,10 @@ static const int64_t gkdi_max_clock_skew = 3000000000; gnutls_mac_algorithm_t get_sp800_108_mac_algorithm( const struct KdfAlgorithm kdf_algorithm); -NTSTATUS compute_seed_key( - TALLOC_CTX *mem_ctx, - const DATA_BLOB target_security_descriptor, - const struct ProvRootKey *const root_key, - const struct Gkid gkid, - uint8_t out[static const GKDI_KEY_LEN]); +NTSTATUS compute_seed_key(TALLOC_CTX *mem_ctx, + const DATA_BLOB target_security_descriptor, + const struct ProvRootKey *const root_key, + const struct Gkid gkid, + uint8_t out[static const GKDI_KEY_LEN]); #endif /* LIB_CRYPTO_GKDI_H */ diff --git a/lib/crypto/test_gkdi_key_derivation.c b/lib/crypto/test_gkdi_key_derivation.c index 22f33561a57..f80519b5c7f 100644 --- a/lib/crypto/test_gkdi_key_derivation.c +++ b/lib/crypto/test_gkdi_key_derivation.c @@ -464,7 +464,7 @@ static void test_gkdi_key_derivation(void **state) status = compute_seed_key( mem_ctx, DATA_BLOB_CONST(gmsa_security_descriptor, - sizeof gmsa_security_descriptor), + sizeof gmsa_security_descriptor), &test_vector->root_key, test_vector->gkid, out);