Commit 229f7b38 authored by Dmitry Belyavskiy's avatar Dmitry Belyavskiy Committed by Matt Caswell
Browse files

Providing missing accessor to EVP_PKEY.engine 



Reviewed-by: default avatarNicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8329)
parent f5c99167

crypto/evp/p_lib.c

+5 −0
Original line number Diff line number Diff line
@@ -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)

{

include/openssl/evp.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

util/libcrypto.num

+1 −0
Original line number Diff line number Diff line
@@ -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