giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix CKM_RSA_PKCS in encrypt_decrypt().

This commit is contained in:
alegon01 2019-02-05 12:03:51 +01:00
parent 9aa413bd7e
commit 084624f340
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tools/pkcs11-tool.c
View File

@ -5258,22 +5258,11 @@ static int encrypt_decrypt(CK_SESSION_HANDLE session,
int failed;
CK_RV rv;
int pad;
CK_MECHANISM_TYPE hash_alg = CKM_SHA_1;
CK_MECHANISM_TYPE hash_alg;
CK_RSA_PKCS_OAEP_PARAMS oaep_params;
printf(" %s: ", p11_mechanism_to_name(mech_type));
if ((mech_type == CKM_RSA_PKCS) || (mech_type == CKM_RSA_PKCS_OAEP)) {
if (opt_hash_alg == 0) {
hash_alg = CKM_SHA_1;
} else if (opt_hash_alg != CKM_SHA_1) {
printf("Only CKM_SHA_1 supported\n");
return 0;
} else {
hash_alg = opt_hash_alg;
}
}
pkey = get_public_key(session, privKeyObject);
if (pkey == NULL)
return 0;
@ -5292,6 +5281,14 @@ static int encrypt_decrypt(CK_SESSION_HANDLE session,
in_len = mod_len-11;
break;
case CKM_RSA_PKCS_OAEP: {
if (opt_hash_alg == 0) {
hash_alg = CKM_SHA_1;
} else if (opt_hash_alg != CKM_SHA_1) {
printf("Only CKM_RSA_PKCS_OAEP with CKM_SHA_1 supported\n");
return 0;
} else {
hash_alg = opt_hash_alg;
}
pad = RSA_PKCS1_OAEP_PADDING;
/* Limit the input length to <= mod_len-2-2*hlen */
size_t len = 2+2*hash_length(hash_alg);