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

fix https://github.com/OpenSC/OpenSC/issues/1786 

Thanks to Alexandre Gonzalo
This commit is contained in:
Frank Morgner 2019-09-16 13:06:38 +02:00
parent 3b632e64a1
commit 25bc8fc167
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5576,12 +5576,14 @@ static int encrypt_decrypt(CK_SESSION_HANDLE session,
return 0; return 0;
} }
size_t in_len; size_t in_len;
size_t max_in_len;
CK_ULONG mod_len = (get_private_key_length(session, privKeyObject) + 7) / 8; CK_ULONG mod_len = (get_private_key_length(session, privKeyObject) + 7) / 8;
switch (mech_type) { switch (mech_type) {
case CKM_RSA_PKCS: case CKM_RSA_PKCS:
pad = RSA_PKCS1_PADDING; pad = RSA_PKCS1_PADDING;
/* Limit the input length to <= mod_len-11 */ /* input length <= mod_len-11 */
in_len = mod_len-11; max_in_len = mod_len-11;
in_len = 10;
break; break;
case CKM_RSA_PKCS_OAEP: { case CKM_RSA_PKCS_OAEP: {
if (opt_hash_alg != 0) { if (opt_hash_alg != 0) {
@ -5614,18 +5616,20 @@ static int encrypt_decrypt(CK_SESSION_HANDLE session,
} }
pad = RSA_PKCS1_OAEP_PADDING; pad = RSA_PKCS1_OAEP_PADDING;
/* Limit the input length to <= mod_len-2-2*hlen */
size_t len = 2+2*hash_length(hash_alg); size_t len = 2+2*hash_length(hash_alg);
if (len >= mod_len) { if (len >= mod_len) {
printf("Incompatible mechanism and key size\n"); printf("Incompatible mechanism and key size\n");
return 0; return 0;
} }
in_len = mod_len-len; /* input length <= mod_len-2-2*hlen */
max_in_len = mod_len-len;
in_len = 10;
break; break;
} }
case CKM_RSA_X_509: case CKM_RSA_X_509:
pad = RSA_NO_PADDING; pad = RSA_NO_PADDING;
/* Limit the input length to the modulus length */ /* input length equals modulus length */
max_in_len = mod_len;
in_len = mod_len; in_len = mod_len;
break; break;
default: default:
@ -5634,7 +5638,11 @@ static int encrypt_decrypt(CK_SESSION_HANDLE session,
} }
if (in_len > sizeof(orig_data)) { if (in_len > sizeof(orig_data)) {
printf("Private key size is too long\n"); printf("Input data is too large\n");
return 0;
}
if (in_len > max_in_len) {
printf("Input data is too large for this key\n");
return 0; return 0;
} }