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

- Patch from Olaf Kirch to implement of RSA exponent 

and modulus retrievel in pkcs11 code

- Fixed the checking of PIN length in pkcs11 login


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@268 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
fabled 2002-03-07 11:57:49 +00:00
parent 2fda14ebf5
commit 9419b353f6
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pkcs11/framework-pkcs15.c
View File

@ -317,6 +317,10 @@ static CK_RV pkcs15_login(struct sc_pkcs11_card *p11card,
struct sc_pkcs15_object *auth_object = (struct sc_pkcs15_object*) fw_token;
struct sc_pkcs15_pin_info *pin = (struct sc_pkcs15_pin_info*) auth_object->data;
if (ulPinLen < pin->min_length ||
ulPinLen > pin->stored_length)
return CKR_PIN_LEN_RANGE;
rc = sc_pkcs15_verify_pin(card, pin, pPin, ulPinLen);
debug(context, "PIN verification returned %d\n", rc);
return sc_to_cryptoki_error(rc, p11card->reader);
@ -549,6 +553,8 @@ CK_RV pkcs15_pubkey_get_attribute(struct sc_pkcs11_session *session,
CK_ATTRIBUTE_PTR attr)
{
struct pkcs15_pubkey_object *pubkey = (struct pkcs15_pubkey_object*) object;
CK_ULONG mask, bits, word, j, n;
CK_BYTE exponent[4];
switch (attr->type) {
case CKA_CLASS:
@ -597,7 +603,25 @@ CK_RV pkcs15_pubkey_get_attribute(struct sc_pkcs11_session *session,
pubkey->rsakey->modulus_len);
break;
case CKA_MODULUS_BITS:
bits = pubkey->rsakey->modulus_len * 8;
for (mask = 0x80; mask; mask >>= 1, bits--) {
if (pubkey->rsakey->modulus[0] & mask)
break;
}
check_attribute_buffer(attr, sizeof(bits));
*(CK_ULONG *) attr->pValue = bits;
break;
case CKA_PUBLIC_EXPONENT:
word = pubkey->rsakey->exponent;
for (j = 0, n = 4; j < n; word <<= 8) {
if ((word & 0xFF000000) || j)
exponent[j++] = word >> 24;
else
n--;
}
check_attribute_buffer(attr, n);
memcpy(attr->pValue, exponent, n);
break;
default:
return CKR_ATTRIBUTE_TYPE_INVALID;
}

3
src/pkcs11/pkcs11-session.c
View File

@ -151,9 +151,6 @@ CK_RV C_Login(CK_SESSION_HANDLE hSession, /* the session's handle */
if (userType != CKU_USER)
return CKR_USER_TYPE_INVALID;
if (ulPinLen < 4 || ulPinLen > 8)
return CKR_PIN_LEN_RANGE;
rv = pool_find(&session_pool, hSession, (void**) &session);
if (rv != CKR_OK)
return rv;