diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-14 21:09:49 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-21 09:04:10 +0200 |
| commit | ded346fad2f2c86bc13ac3beaf5e00e969f04442 (patch) | |
| tree | 6422944936a63fef97081630a5f5ef6ff7017a3c /include/crypto | |
| parent | 4cdf44c46b699934b86b9d842cfd4448b7dbe58e (diff) | |
Add libctx and propq param to ASN.1 sign/verify/HMAC/decrypt
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11808)
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/asn1.h | 7 | ||||
| -rw-r--r-- | include/crypto/evp.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h index d3683649bc..68672d1a02 100644 --- a/include/crypto/asn1.h +++ b/include/crypto/asn1.h @@ -49,9 +49,10 @@ struct evp_pkey_asn1_method_st { const unsigned char **pder, int derlen); int (*old_priv_encode) (const EVP_PKEY *pkey, unsigned char **pder); /* Custom ASN1 signature verification */ - int (*item_verify) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, - X509_ALGOR *a, ASN1_BIT_STRING *sig, EVP_PKEY *pkey); - int (*item_sign) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, + int (*item_verify) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *data, + const X509_ALGOR *a, const ASN1_BIT_STRING *sig, + EVP_PKEY *pkey); + int (*item_sign) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *data, X509_ALGOR *alg1, X509_ALGOR *alg2, ASN1_BIT_STRING *sig); int (*siginf_set) (X509_SIG_INFO *siginf, const X509_ALGOR *alg, diff --git a/include/crypto/evp.h b/include/crypto/evp.h index d2b2584357..512b4d6f48 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -769,6 +769,9 @@ int evp_pkey_ctx_get_params_strict(EVP_PKEY_CTX *ctx, OSSL_PARAM *params); EVP_PKEY *evp_pkcs82pkey_int(const PKCS8_PRIV_KEY_INFO *p8, OPENSSL_CTX *libctx, const char *propq); +EVP_MD_CTX *evp_md_ctx_new_with_libctx(EVP_PKEY *pkey, + const ASN1_OCTET_STRING *id, + OPENSSL_CTX *libctx, const char *propq); #endif /* !defined(FIPS_MODULE) */ void evp_method_store_flush(OPENSSL_CTX *libctx); int evp_set_default_properties_int(OPENSSL_CTX *libctx, const char *propq, |