public-key: Add optional parameters argument to verify() method

This commit is contained in:
Tobias Brunner
2017-11-08 16:48:10 +01:00
parent 677072accc
commit a413571f3b
28 changed files with 60 additions and 46 deletions
@@ -332,7 +332,8 @@ METHOD(certificate_t, issued_by, bool,
tbs = openssl_i2chunk(X509_CRL_INFO, this->crl->crl);
#endif
X509_CRL_get0_signature(this->crl, &sig, NULL);
valid = key->verify(key, this->scheme, tbs, openssl_asn1_str2chunk(sig));
valid = key->verify(key, this->scheme, NULL, tbs,
openssl_asn1_str2chunk(sig));
free(tbs.ptr);
key->destroy(key);
if (valid && scheme)
@@ -151,7 +151,7 @@ METHOD(public_key_t, get_type, key_type_t,
METHOD(public_key_t, verify, bool,
private_openssl_ec_public_key_t *this, signature_scheme_t scheme,
chunk_t data, chunk_t signature)
void *params, chunk_t data, chunk_t signature)
{
switch (scheme)
{
@@ -256,7 +256,7 @@ static auth_cfg_t *verify_signature(CMS_SignerInfo *si, int hash_oid)
key = cert->get_public_key(cert);
if (key)
{
if (key->verify(key, signature_scheme_from_oid(hash_oid),
if (key->verify(key, signature_scheme_from_oid(hash_oid), NULL,
attrs, sig))
{
found = auth->clone(auth);
@@ -137,7 +137,7 @@ METHOD(public_key_t, get_type, key_type_t,
METHOD(public_key_t, verify, bool,
private_openssl_rsa_public_key_t *this, signature_scheme_t scheme,
chunk_t data, chunk_t signature)
void *params, chunk_t data, chunk_t signature)
{
switch (scheme)
{
@@ -430,7 +430,8 @@ METHOD(certificate_t, issued_by, bool,
tbs = openssl_i2chunk(X509_CINF, this->x509->cert_info);
#endif
X509_get0_signature(&sig, NULL, this->x509);
valid = key->verify(key, this->scheme, tbs, openssl_asn1_str2chunk(sig));
valid = key->verify(key, this->scheme, NULL, tbs,
openssl_asn1_str2chunk(sig));
free(tbs.ptr);
key->destroy(key);
if (valid && scheme)