Skip to content

Commit 5132a32

Browse files
authored
Rename symbol current to current_cdi (#81)
Rename current to current_cdi, because it clashes with the Linux Kernel macro `current`.
1 parent ab73ebc commit 5132a32

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

include/nat20/functionality.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,14 @@ extern n20_error_t n20_derive_key(n20_crypto_context_t *crypto_ctx,
179179
* returned in the given buffer.
180180
*
181181
* @param crypto_ctx The crypto context.
182-
* @param current The current CDI secret to derive the key from.
182+
* @param current_cdi The current CDI secret to derive the key from.
183183
* @param next The derived key.
184184
* @param info The information to use for the derivation.
185185
*
186186
* @return n20_error_ok_e on success, or an error code on failure.
187187
*/
188188
extern n20_error_t n20_next_level_cdi_attest(n20_crypto_context_t *crypto_ctx,
189-
n20_crypto_key_t current,
189+
n20_crypto_key_t current_cdi,
190190
n20_crypto_key_t *next,
191191
n20_compressed_input_t info);
192192

src/core/functionality.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ n20_error_t n20_derive_key(n20_crypto_context_t *crypto_ctx,
202202
}
203203

204204
n20_error_t n20_next_level_cdi_attest(n20_crypto_context_t *crypto_ctx,
205-
n20_crypto_key_t current,
205+
n20_crypto_key_t current_cdi,
206206
n20_crypto_key_t *next,
207207
n20_compressed_input_t info) {
208208

209209
return n20_derive_key(crypto_ctx,
210-
current,
210+
current_cdi,
211211
next,
212212
n20_crypto_key_type_cdi_e,
213213
(n20_slice_t){.size = N20_FUNC_COMPRESSED_INPUT_SIZE, .buffer = &info[0]},

0 commit comments

Comments
 (0)