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: don't check hash size when the main algorithm is ECDSA #1497

Merged
merged 1 commit into from
Apr 26, 2017
Merged

crypto: don't check hash size when the main algorithm is ECDSA #1497

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
45 changes: 20 additions & 25 deletions core/tee/tee_svc_cryp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3487,35 +3487,16 @@ TEE_Result syscall_asymm_verify(unsigned long state,
goto out;
}

if (TEE_ALG_GET_MAIN_ALG(cs->algo) == TEE_MAIN_ALGO_ECDSA)
hash_algo = TEE_ALG_SHA1;
else
switch (TEE_ALG_GET_MAIN_ALG(cs->algo)) {
case TEE_MAIN_ALGO_RSA:
hash_algo = TEE_DIGEST_HASH_TO_ALGO(cs->algo);

res = tee_hash_get_digest_size(hash_algo, &hash_size);
if (res != TEE_SUCCESS)
goto out;

if (TEE_ALG_GET_MAIN_ALG(cs->algo) == TEE_MAIN_ALGO_DSA) {
/*
* Depending on the DSA algorithm (NIST), the digital signature
* output size may be truncated to the size of a key pair
* (Q prime size). Q prime size must be less or equal than the
* hash output length of the hash algorithm involved.
*/
if (data_len > hash_size) {
res = TEE_ERROR_BAD_PARAMETERS;
goto out;
}
} else {
res = tee_hash_get_digest_size(hash_algo, &hash_size);
if (res != TEE_SUCCESS)
break;
if (data_len != hash_size) {
res = TEE_ERROR_BAD_PARAMETERS;
goto out;
break;
}
}

switch (TEE_ALG_GET_MAIN_ALG(cs->algo)) {
case TEE_MAIN_ALGO_RSA:
salt_len = pkcs1_get_salt_len(params, num_params, hash_size);
if (!crypto_ops.acipher.rsassa_verify) {
res = TEE_ERROR_NOT_IMPLEMENTED;
Expand All @@ -3527,6 +3508,20 @@ TEE_Result syscall_asymm_verify(unsigned long state,
break;

case TEE_MAIN_ALGO_DSA:
hash_algo = TEE_DIGEST_HASH_TO_ALGO(cs->algo);
res = tee_hash_get_digest_size(hash_algo, &hash_size);
if (res != TEE_SUCCESS)
break;
/*
* Depending on the DSA algorithm (NIST), the digital signature
* output size may be truncated to the size of a key pair
* (Q prime size). Q prime size must be less or equal than the
* hash output length of the hash algorithm involved.
*/
if (data_len > hash_size) {
res = TEE_ERROR_BAD_PARAMETERS;
break;
}
if (!crypto_ops.acipher.dsa_verify) {
res = TEE_ERROR_NOT_IMPLEMENTED;
break;
Expand Down