diff options
author | Dmitry Belyavskiy <beldmit@gmail.com> | 2019-02-25 18:02:33 +0300 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2019-03-19 10:42:33 +0000 |
commit | 229f7b38f0e1d65e2aac9d227f3963a1a578430b (patch) | |
tree | 85d981160b1694cda1933b4c6d3c463f30d0cb15 | |
parent | f5c9916742655f872018426838cff4ff04da5321 (diff) | |
download | openssl-229f7b38f0e1d65e2aac9d227f3963a1a578430b.zip openssl-229f7b38f0e1d65e2aac9d227f3963a1a578430b.tar.gz openssl-229f7b38f0e1d65e2aac9d227f3963a1a578430b.tar.bz2 |
Providing missing accessor to EVP_PKEY.engine
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8329)
-rw-r--r-- | crypto/evp/p_lib.c | 5 | ||||
-rw-r--r-- | include/openssl/evp.h | 1 | ||||
-rw-r--r-- | util/libcrypto.num | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 9a882e9..c6ebfe6 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -396,6 +396,11 @@ int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e) pkey->pmeth_engine = e; return 1; } + +ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey) +{ + return pkey->engine; +} #endif int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) { diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 72060e7..ca7655d 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1055,6 +1055,7 @@ int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len); int EVP_PKEY_set_alias_type(EVP_PKEY *pkey, int type); # ifndef OPENSSL_NO_ENGINE int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e); +ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey); # endif int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key); void *EVP_PKEY_get0(const EVP_PKEY *pkey); diff --git a/util/libcrypto.num b/util/libcrypto.num index 711ccd9..bf14bbd 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4790,3 +4790,4 @@ OSSL_PARAM_get_octet_ptr 4737 3_0_0 EXIST::FUNCTION: OSSL_PARAM_set_octet_ptr 4738 3_0_0 EXIST::FUNCTION: X509_set_sm2_id 4739 3_0_0 EXIST::FUNCTION:SM2 X509_get0_sm2_id 4740 3_0_0 EXIST::FUNCTION:SM2 +EVP_PKEY_get0_engine 4741 3_0_0 EXIST::FUNCTION:ENGINE |