diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-07 14:45:22 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 10:00:28 +0100 |
| commit | 9ab7fe483629704b09dc43c1998e0e489615390f (patch) | |
| tree | 7080bba8815bbf809a077a4f2711838f5acbf2cd /include | |
| parent | 0b3a4ef27a6c2a427dc2d4a87c52677d57c90f4c (diff) | |
Move CMS signing code out of the algorithms and into CMS
There is a large amount of CMS sepcific code in the algorithms. This is in
the wrong place and breaks layering. This code should be in the CMS layer.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13088)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/asn1.h | 2 | ||||
| -rw-r--r-- | include/crypto/rsa.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h index 72e105276f..08018e4cf1 100644 --- a/include/crypto/asn1.h +++ b/include/crypto/asn1.h @@ -137,4 +137,4 @@ int asn1_type_get_octetstring_int(const ASN1_TYPE *a, long *num, int x509_algor_new_from_md(X509_ALGOR **palg, const EVP_MD *md); const EVP_MD *x509_algor_get_md(X509_ALGOR *alg); X509_ALGOR *x509_algor_mgf1_decode(X509_ALGOR *alg); -int x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md);
\ No newline at end of file +int x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md); diff --git a/include/crypto/rsa.h b/include/crypto/rsa.h index 85682aa55d..7ec745766f 100644 --- a/include/crypto/rsa.h +++ b/include/crypto/rsa.h @@ -93,6 +93,10 @@ extern const char *ossl_rsa_mp_factor_names[]; extern const char *ossl_rsa_mp_exp_names[]; extern const char *ossl_rsa_mp_coeff_names[]; +ASN1_STRING *ossl_rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx); +int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, + const X509_ALGOR *sigalg, EVP_PKEY *pkey); + # if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) int rsa_acvp_test_gen_params_new(OSSL_PARAM **dst, const OSSL_PARAM src[]); void rsa_acvp_test_gen_params_free(OSSL_PARAM *dst); |