aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Fox <jamie.fox@arm.com>2019-09-05 18:23:31 +0100
committerJamie Fox <jamie.fox@arm.com>2019-09-10 16:41:07 +0100
commit2697dd028f29e1df218c556ea1564c790f7c9d98 (patch)
tree8ef5bd5203afd76f226879283d6b19f676a4fc61
parent0f869bbea42ae7870970f3d64b221398cbb60881 (diff)
downloadtrusted-firmware-m-2697dd028f29e1df218c556ea1564c790f7c9d98.tar.gz
Crypto: Fix key derivation iovec handling
Fixes an off-by-one error in the iovec indices in the tfm_crypto_key_derivation function. Change-Id: Id944ed3da290ed26a73dcc1bce7741b2d9e73d5d Signed-off-by: Jamie Fox <jamie.fox@arm.com>
-rw-r--r--secure_fw/services/crypto/crypto_generator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/secure_fw/services/crypto/crypto_generator.c b/secure_fw/services/crypto/crypto_generator.c
index 4291bde146..9f37022bf2 100644
--- a/secure_fw/services/crypto/crypto_generator.c
+++ b/secure_fw/services/crypto/crypto_generator.c
@@ -218,13 +218,13 @@ psa_status_t tfm_crypto_key_derivation(psa_invec in_vec[],
psa_crypto_generator_t *generator = NULL;
if (in_len > 1) {
- salt = in_vec[2].base;
- salt_length = in_vec[2].len;
+ salt = in_vec[1].base;
+ salt_length = in_vec[1].len;
}
if (in_len > 2) {
- label = in_vec[3].base;
- label_length = in_vec[3].len;
+ label = in_vec[2].base;
+ label_length = in_vec[2].len;
}
status = tfm_crypto_check_handle_owner(key_handle, NULL);