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

crypto: introduce CFG_CRYPTO_HW_PBKDF2 #6216

Merged
merged 1 commit into from
Sep 13, 2023
Merged

crypto: introduce CFG_CRYPTO_HW_PBKDF2 #6216

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
2 changes: 2 additions & 0 deletions core/tee/sub.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ srcs-y += entry_std.c
srcs-y += tee_cryp_utl.c
srcs-$(CFG_CRYPTO_HKDF) += tee_cryp_hkdf.c
srcs-$(CFG_CRYPTO_CONCAT_KDF) += tee_cryp_concat_kdf.c
ifneq ($(CFG_CRYPTO_HW_PBKDF2),y)
srcs-$(CFG_CRYPTO_PBKDF2) += tee_cryp_pbkdf2.c
endif

ifeq ($(CFG_WITH_USER_TA),y)
srcs-y += tee_obj.c
Expand Down
5 changes: 5 additions & 0 deletions mk/config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,3 +1038,8 @@ CFG_TA_OPTEE_CORE_API_COMPAT_1_1 ?= n
# - PerInstance/AttestationTest#
# Note that this violates GP requirements of HMAC size range.
CFG_HMAC_64_1024_RANGE ?= n

# Enable a hardware pbkdf2 function
# By default use standard pbkdf2 implementation
CFG_CRYPTO_HW_PBKDF2 ?= n
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jforissier, would it make sense to add a:

$(eval $(call cfg-depends-all,CFG_CRYPTO_HW_PBKDF2,CFG_CRYPTO_PBKDF2))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I agree

$(eval $(call cfg-depends-all,CFG_CRYPTO_HW_PBKDF2,CFG_CRYPTO_PBKDF2))
Loading