Skip to content

[noup] mbedtls: Modify MBEDTLS_NIST_KW_C to avoid name conflict #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rado17 wants to merge 1 commit into from
Closed

[noup] mbedtls: Modify MBEDTLS_NIST_KW_C to avoid name conflict #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/crypto/crypto_mbedtls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ int aes_128_ctr_encrypt(
return aes_ctr_encrypt(key, 16, nonce, data, data_len);
}

#ifdef MBEDTLS_NIST_KW_C
#ifdef HOSTAP_MBEDTLS_NIST_KW_C
int aes_wrap(const u8 *kek, size_t kek_len, int n, const u8 *plain, u8 *cipher)
{
mbedtls_nist_kw_context ctx;
Expand Down Expand Up @@ -700,7 +700,7 @@ int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)

/* Only enable this if all other ciphers are using MbedTLS implementation */
#if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_CMAC_C) && \
defined(MBEDTLS_NIST_KW_C)
defined(HOSTAP_MBEDTLS_NIST_KW_C)
int aes_ccm_ae(
const u8 *key, size_t key_len, const u8 *nonce, size_t M, const u8 *plain,
size_t plain_len, const u8 *aad, size_t aad_len, u8 *crypt, u8 *auth)
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_mbedtls_alt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ void aes_decrypt_deinit(void *ctx)

#include "aes_wrap.h"

#ifdef MBEDTLS_NIST_KW_C
#ifdef HOSTAP_MBEDTLS_NIST_KW_C

#include <mbedtls/nist_kw.h>

Expand Down Expand Up @@ -846,7 +846,7 @@ int aes_unwrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 *plain
mbedtls_nist_kw_free(&ctx);
return ret;
}
#endif /* MBEDTLS_NIST_KW_C */
#endif /* HOSTAP_MBEDTLS_NIST_KW_C */

#ifdef MBEDTLS_CMAC_C

Expand Down