Skip to content
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

Jump to bottom

Make Openssl CMAC API (omac1_aes_vector) Availalable in Non FIPs Mode #85

Merged
merged 7 commits into from
Mar 23, 2024
Merged

Make Openssl CMAC API (omac1_aes_vector) Availalable in Non FIPs Mode #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
785417b
Make Openssl omac1_aes_vector(CMAC) available in non FIPS mode.
wumiaont Mar 20, 2024
dcdb0a9
Merge branch 'master' of https://github.com/wumiaont/sonic-wpa-suppli…
wumiaont Mar 20, 2024
0f9ad09
Merge branch 'master' into master
wumiaont Mar 20, 2024
9cbd6f9
Merge branch 'master' of https://github.com/wumiaont/sonic-wpa-suppli…
wumiaont Mar 20, 2024
563acd4
Fix Makefile
wumiaont Mar 20, 2024
8691926
Make openssl/cmac.h included for version < 3.0
wumiaont Mar 20, 2024
3c5398b
Update crypto_openssl.c
wumiaont Mar 20, 2024
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
2 changes: 2 additions & 0 deletions hostapd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,11 +919,13 @@ endif
ifdef NEED_AES_ENCBLOCK
AESOBJS += ../src/crypto/aes-encblock.o
endif
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
AESOBJS += ../src/crypto/aes-omac1.o
endif
endif
endif
ifdef NEED_AES_UNWRAP
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
Expand Down
6 changes: 2 additions & 4 deletions src/crypto/crypto_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <openssl/dh.h>
#include <openssl/hmac.h>
#include <openssl/rand.h>
#ifdef CONFIG_OPENSSL_CMAC
#if OPENSSL_VERSION_NUMBER < 0x30000000L
#include <openssl/cmac.h>
#endif /* CONFIG_OPENSSL_CMAC */
#endif /* OpenSSL version < 3.0 */
#ifdef CONFIG_ECC
#include <openssl/ec.h>
#include <openssl/x509.h>
Expand Down Expand Up @@ -1214,7 +1214,6 @@ int crypto_get_random(void *buf, size_t len)
}


#ifdef CONFIG_OPENSSL_CMAC
int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
const u8 *addr[], const size_t *len, u8 *mac)
{
Expand Down Expand Up @@ -1308,7 +1307,6 @@ int omac1_aes_256(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
{
return omac1_aes_vector(key, 32, 1, &data, &data_len, mac);
}
#endif /* CONFIG_OPENSSL_CMAC */


struct crypto_bignum * crypto_bignum_init(void)
Expand Down
5 changes: 1 addition & 4 deletions wpa_supplicant/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ endif

ifdef CONFIG_FIPS
CONFIG_NO_RANDOM_POOL=
CONFIG_OPENSSL_CMAC=y
endif

OBJS = config.o
Expand Down Expand Up @@ -1330,9 +1329,7 @@ ifdef NEED_AES_ENCBLOCK
AESOBJS += ../src/crypto/aes-encblock.o
endif
NEED_AES_ENC=y
ifdef CONFIG_OPENSSL_CMAC
CFLAGS += -DCONFIG_OPENSSL_CMAC
else
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
AESOBJS += ../src/crypto/aes-omac1.o
Expand Down
Loading