pkcs7.c also uses signature_scheme_from_oid()
This commit is contained in:
committed by
Martin Willi
parent
f3e87f5935
commit
53df4793d4
+6
-18
@@ -363,25 +363,13 @@ bool pkcs7_parse_signedData(chunk_t blob, contentInfo_t *data, x509cert_t **cert
|
|||||||
DBG1("only RSA digest encryption supported");
|
DBG1("only RSA digest encryption supported");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
switch (digest_alg)
|
|
||||||
|
/* determine signature scheme */
|
||||||
|
scheme = signature_scheme_from_oid(digest_alg);
|
||||||
|
|
||||||
|
if (scheme == SIGN_UNKNOWN)
|
||||||
{
|
{
|
||||||
case OID_MD5:
|
return FALSE;
|
||||||
scheme = SIGN_RSA_EMSA_PKCS1_MD5;
|
|
||||||
break;
|
|
||||||
case OID_SHA1:
|
|
||||||
scheme = SIGN_RSA_EMSA_PKCS1_SHA1;
|
|
||||||
break;
|
|
||||||
case OID_SHA256:
|
|
||||||
scheme = SIGN_RSA_EMSA_PKCS1_SHA256;
|
|
||||||
break;
|
|
||||||
case OID_SHA384:
|
|
||||||
scheme = SIGN_RSA_EMSA_PKCS1_SHA384;
|
|
||||||
break;
|
|
||||||
case OID_SHA512:
|
|
||||||
scheme = SIGN_RSA_EMSA_PKCS1_SHA512;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
if (key->verify(key, scheme, *attributes, encrypted_digest))
|
if (key->verify(key, scheme, *attributes, encrypted_digest))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user