diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-06 17:02:43 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 11:00:19 +0200 |
| commit | 0b3a4ef27a6c2a427dc2d4a87c52677d57c90f4c (patch) | |
| tree | 5615f080605adfb18b83b2ee6610a9a3daa15451 /crypto/evp/pmeth_lib.c | |
| parent | Remove a CMS key downgrade (diff) | |
| download | openssl-0b3a4ef27a6c2a427dc2d4a87c52677d57c90f4c.tar.xz openssl-0b3a4ef27a6c2a427dc2d4a87c52677d57c90f4c.zip | |
Move CMS enveloping code out of the algorithms and into CMS
There is quite a large amount of algorithm specific CMS code sitting in
the algorithm directories. However, this seems to break layering.
Algorithms really have no business knowing anything about CMS. Really it
should be the other way around. Where there is algorithm specific CMS code
it is the CMS layer that should know how to handle different algorithms.
Therefore we move this code into the CMS layer.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13088)
Diffstat (limited to 'crypto/evp/pmeth_lib.c')
| -rw-r--r-- | crypto/evp/pmeth_lib.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index fc06a101c8..8cd95956f8 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -1762,6 +1762,16 @@ int evp_pkey_ctx_use_cached_data(EVP_PKEY_CTX *ctx) return ret; } +OPENSSL_CTX *evp_pkey_ctx_get0_libctx(EVP_PKEY_CTX *ctx) +{ + return ctx->libctx; +} + +const char *evp_pkey_ctx_get0_propq(EVP_PKEY_CTX *ctx) +{ + return ctx->propquery; +} + /* Utility functions to send a string of hex string to a ctrl */ int EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str) |