diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-10-17 08:23:43 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-11 12:43:27 +0100 |
| commit | b9a2afdfe68a5212dc2352a574a6ca98d8cf5140 (patch) | |
| tree | 1f399dba2607d07779eeb57419d9bc2484d3a135 /include | |
| parent | cd861ab73d57ea21dd7342b13f4a733da229e15e (diff) | |
ENCODER: Add output structure support for EVP_PKEY encoding
OSSL_ENCODER_CTX_new_by_EVP_PKEY() takes one more argument to express
the desired outermost structure for the output.
This also adds OSSL_ENCODER_CTX_prune_encoders(), which is used to
reduce the stack of encoders found according to criteria formed from
the combination of desired selection, output type and output
structure.
squash! ENCODER: Add output structure support for EVP_PKEY encoding
Replace the paragraph talking about OSSL_ENCODER_CTX_prune_encoders() with:
The encoding processor encoder_process() is enhanced with better
analysis of the stack of encoder implementations. To avoid having to
keep an on the side array of information, it uses recursion.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13167)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/encoder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/encoder.h b/include/openssl/encoder.h index 760ff05c77..f50d16517e 100644 --- a/include/openssl/encoder.h +++ b/include/openssl/encoder.h @@ -114,8 +114,9 @@ int OSSL_ENCODER_to_data(OSSL_ENCODER_CTX *ctx, unsigned char **pdata, * This is more useful than calling OSSL_ENCODER_CTX_new(). */ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_by_EVP_PKEY(const EVP_PKEY *pkey, - const char *output_type, int selection, + const char *output_type, + const char *output_struct, OSSL_LIB_CTX *libctx, const char *propquery); |