summaryrefslogtreecommitdiff
path: root/core/tee/sub.mk
diff options
context:
space:
mode:
authorJerome Forissier <jerome.forissier@linaro.org>2014-12-11 10:45:22 +0100
committerJerome Forissier <jerome.forissier@linaro.org>2015-01-16 15:46:00 +0100
commit0f2293b796b141d15c18db856d63f200e4f02981 (patch)
tree129863aaa212fef10cea53b987b9cc090f2d6965 /core/tee/sub.mk
parentcdb198a7dbc3a5787edb53f5d2a256e5738d4377 (diff)
Add PKCS #5 v2.0 key derivation function 2 (PBKDF2)
This commit implements a crypto extension to support the key derivation function defined in section 5.2 of RFC 2898 (https://www.ietf.org/rfc/rfc2898.txt), which is a re-publish of PKCS #5 v2.0. The underlying pseudorandom function is HMAC-SHA1, which is the default PRF specified in the RFC. It would be trivial to support the other HMAC functions already implemented in OP-TEE. See documentation/extensions/crypto_pbkdf2.md for details. Tested on PLATFORM=vexpress-qemu_virt with the test vectors from RFC 6070 (https://www.ietf.org/rfc/rfc6070.txt). Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Xiaoqiang Du <xiaoqiang.du@linaro.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Reviewed-by: Pascal Brand <pascal.brand@linaro.org> Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)
Diffstat (limited to 'core/tee/sub.mk')
-rw-r--r--core/tee/sub.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/tee/sub.mk b/core/tee/sub.mk
index 0d3ab404..a509595e 100644
--- a/core/tee/sub.mk
+++ b/core/tee/sub.mk
@@ -11,6 +11,10 @@ CFG_CRYPTO_HKDF ?= y
# This is an OP-TEE extension
CFG_CRYPTO_CONCAT_KDF ?= y
+# PKCS #5 v2.0 / RFC 2898 key derivation function 2
+# This is an OP-TEE extension
+CFG_CRYPTO_PBKDF2 ?= y
+
endif
srcs-y += tee_svc.c
@@ -19,6 +23,7 @@ srcs-y += tee_svc_storage.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
+srcs-$(CFG_CRYPTO_PBKDF2) += tee_cryp_pbkdf2.c
srcs-y += tee_fs.c
srcs-y += tee_obj.c
srcs-y += tee_pobj.c