crypto: atmel-ecc - reject hardware ECDH without a public key
Subsystems (3)
PATCH 1/1 crypto: atmel-ecc - reject hardware ECDH without a public key
The hardware ECDH path in atmel_ecdh_compute_shared_secret() uses the private key stored in the device. However, the public key is cached only after atmel_ecdh_set_secret() successfully generated that private key for the current tfm.
atmel_ecdh_generate_public_key() already rejects requests when no public key is cached. Add the same check to atmel_ecdh_compute_shared_secret() to prevent the device from using a private key that was not generated for the current tfm.
--- drivers/crypto/atmel-ecc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/crypto/atmel-ecc.c +3 -0
@@ -173,6 +173,9 @@ static int atmel_ecdh_compute_shared_secret(struct kpp_request *req)return crypto_kpp_compute_shared_secret (req); } +if (!ctx->public_key) +return -EINVAL ; +/* must have exactly two points to be on the curve */ if (req->src_len !=ATMEL_ECC_PUBKEY_SIZE )return -EINVAL ;
Quoted 21 lines · Thorsten Blum
The hardware ECDH path in
atmel_ecdh_compute_shared_secret()uses the private key stored in the device. However, the public key is cached only afteratmel_ecdh_set_secret()successfully generated that private key for the current tfm.
atmel_ecdh_generate_public_key()already rejects requests when no public key is cached. Add the same check toatmel_ecdh_compute_shared_secret()to prevent the device from using a private key that was not generated for the current tfm.Fixes 11105693fa05 ("crypto: atmel-ecc - introduce Microchip / Atmel ECC driver")Signed-off-by Thorsten Blum <[email protected]>--- drivers/crypto/atmel-ecc.c | 3 +++ 1 file changed, 3 insertions(+)drivers/crypto/atmel-ecc.c +0
-0
drivers/crypto/atmel-ecc.c static int atmel_ecdh_compute_shared_secret(struct kpp_request *req) · line 181
Quoted 9 lines
drivers/crypto/atmel-ecc.c +3
-0@@ -173,6 +173,9 @@ static int atmel_ecdh_compute_shared_secret(struct kpp_request *req)return crypto_kpp_compute_shared_secret (req); } +if (!ctx->public_key) +return -EINVAL ; +/* must have exactly two points to be on the curve */ if (req->src_len !=ATMEL_ECC_PUBKEY_SIZE )return -EINVAL ;
I'll need to rebase and resend this assuming [1] is applied first, as it currently doesn't apply cleanly.
Herbert Xu
maintainerQuoted 10 lines · Thorsten Blum
The hardware ECDH path in
atmel_ecdh_compute_shared_secret()uses the private key stored in the device. However, the public key is cached only afteratmel_ecdh_set_secret()successfully generated that private key for the current tfm.
atmel_ecdh_generate_public_key()already rejects requests when no public key is cached. Add the same check toatmel_ecdh_compute_shared_secret()to prevent the device from using a private key that was not generated for the current tfm.
Quoted 5 lines
Fixes 11105693fa05 ("crypto: atmel-ecc - introduce Microchip / Atmel ECC driver")Signed-off-by Thorsten Blum <[email protected]>--- drivers/crypto/atmel-ecc.c | 3 +++ 1 file changed, 3 insertions(+)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt