denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkcs11: Convert RFC 3279 ECDSA signatures when verifying

Browse Source 
References #873.
This commit is contained in:
Tobias Brunner
2015-03-09 15:37:07 +01:00
parent b258ed0192
commit e5009fbb66
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c
+33 -4
View File
@@ -208,7 +208,8 @@ METHOD(public_key_t, verify, bool,
CK_SESSION_HANDLE session; CK_SESSION_HANDLE session;
CK_RV rv; CK_RV rv;
hash_algorithm_t hash_alg; hash_algorithm_t hash_alg;
chunk_t hash = chunk_empty; chunk_t hash = chunk_empty, parse, r, s;
size_t len;
mechanism = pkcs11_signature_scheme_to_mech(scheme, this->type, this->k, mechanism = pkcs11_signature_scheme_to_mech(scheme, this->type, this->k,
&hash_alg); &hash_alg);
@@ -218,9 +219,37 @@ METHOD(public_key_t, verify, bool,
signature_scheme_names, scheme); signature_scheme_names, scheme);
return FALSE; return FALSE;
} }
if (sig.len && sig.ptr[0] == 0) switch (scheme)
{ /* trim leading zero byte in sig */ {
sig = chunk_skip(sig, 1); case SIGN_ECDSA_WITH_SHA1_DER:
case SIGN_ECDSA_WITH_SHA256_DER:
case SIGN_ECDSA_WITH_SHA384_DER:
case SIGN_ECDSA_WITH_SHA512_DER:
/* PKCS#11 expects the ECDSA signatures as simple concatenation of
* r and s, so unwrap the ASN.1 encoded sequence */
parse = sig;
if (asn1_unwrap(&parse, &parse) != ASN1_SEQUENCE ||
asn1_unwrap(&parse, &r) != ASN1_INTEGER ||
asn1_unwrap(&parse, &s) != ASN1_INTEGER)
{
return FALSE;
}
r = chunk_skip_zero(r);
s = chunk_skip_zero(s);
len = (get_keysize(this) + 7) / 8;
if (r.len > len || s.len > len)
{
return FALSE;
}
/* concatenate r and s (forced to the defined length) */
sig = chunk_alloca(2*len);
memset(sig.ptr, 0, sig.len);
memcpy(sig.ptr + (len - r.len), r.ptr, r.len);
memcpy(sig.ptr + len + (len - s.len), s.ptr, s.len);
break;
default:
sig = chunk_skip_zero(sig);
break;
} }
rv = this->lib->f->C_OpenSession(this->slot, CKF_SERIAL_SESSION, NULL, NULL, rv = this->lib->f->C_OpenSession(this->slot, CKF_SERIAL_SESSION, NULL, NULL,
&session); &session);