summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-10-26 13:17:42 +0100
committerRichard Levitte <levitte@openssl.org>2020-11-11 11:42:06 +0100
commitdf65c06b59f0ccd06398c0ff3034371fdefd8e70 (patch)
tree35c564e2392d0b885b30ea7c6f8ff42ee5dc1f4e /include
parent67c91ca23eae175a08f0f0c60be6e6957334d25e (diff)
DECODER: Add input structure support for EVP_PKEY decoding
OSSL_DECODER_CTX_new_by_EVP_PKEY() takes one more argument to express the desired outermost structure for the input. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/13248)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/decoder.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/decoder.h b/include/openssl/decoder.h
index 8b360e6198..3c3a9a1ea2 100644
--- a/include/openssl/decoder.h
+++ b/include/openssl/decoder.h
@@ -121,7 +121,9 @@ int OSSL_DECODER_from_data(OSSL_DECODER_CTX *ctx, const unsigned char **pdata,
*/
OSSL_DECODER_CTX *
OSSL_DECODER_CTX_new_by_EVP_PKEY(EVP_PKEY **pkey,
- const char *input_type, const char *keytype,
+ const char *input_type,
+ const char *input_struct,
+ const char *keytype, int selection,
OSSL_LIB_CTX *libctx, const char *propquery);
# ifdef __cplusplus