diff options
| author | Paul Yang <yang.yang@baishancloud.com> | 2017-09-11 23:15:55 +0800 |
|---|---|---|
| committer | Paul Yang <yang.yang@baishancloud.com> | 2017-09-14 12:41:34 +0800 |
| commit | 0822e89addcb8c6b8a135a54a503a429efbe0dbe (patch) | |
| tree | d9bcd486c0ac11e5f265011b7134c1b1ff2aac03 /include | |
| parent | 76b2ae832679d25e6952934481ac38e0e76e2271 (diff) | |
Support EVP_PKEY_meth_remove and pmeth internal cleanup
1. make app pkey methods cleanup internal
2. add EVP_PKEY_meth_remove
Fixes travis-ci failure in #4337
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4356)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 2c01bdf4fd..34c009a4a4 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1276,6 +1276,7 @@ void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags, void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src); void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth); int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth); +int EVP_PKEY_meth_remove(const EVP_PKEY_METHOD *pmeth); size_t EVP_PKEY_meth_get_count(void); const EVP_PKEY_METHOD *EVP_PKEY_meth_get0(size_t idx); |