Commit 0822e89a authored by Paul Yang's avatar Paul Yang
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4356)
parent 76b2ae83

crypto/evp/names.c

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ void evp_cleanup_int(void) 


    EVP_PBE_cleanup();

    OBJ_sigid_free();



    evp_app_cleanup_int();

}



struct doall_cipher {

crypto/evp/pmeth_lib.c

+15 −0
Original line number Diff line number Diff line
@@ -296,6 +296,21 @@ int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth) 
    return 1;

}



void evp_app_cleanup_int(void)

{

    if (app_pkey_methods != NULL)

        sk_EVP_PKEY_METHOD_pop_free(app_pkey_methods, EVP_PKEY_meth_free);

}



int EVP_PKEY_meth_remove(const EVP_PKEY_METHOD *pmeth)

{

    const EVP_PKEY_METHOD *ret;



    ret = sk_EVP_PKEY_METHOD_delete_ptr(app_pkey_methods, pmeth);



    return ret == NULL ? 0 : 1;

}



size_t EVP_PKEY_meth_get_count(void)

{

    size_t rv = OSSL_NELEM(standard_methods);

crypto/include/internal/evp_int.h

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ struct evp_pkey_st { 
void openssl_add_all_ciphers_int(void);

void openssl_add_all_digests_int(void);

void evp_cleanup_int(void);

void evp_app_cleanup_int(void);



/* Pulling defines out of C soure files */

doc/man3/EVP_PKEY_meth_new.pod

+9 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ EVP_PKEY_meth_get_init, EVP_PKEY_meth_get_copy, EVP_PKEY_meth_get_cleanup, 
EVP_PKEY_meth_get_paramgen, EVP_PKEY_meth_get_keygen, EVP_PKEY_meth_get_sign,

EVP_PKEY_meth_get_verify, EVP_PKEY_meth_get_verify_recover, EVP_PKEY_meth_get_signctx,

EVP_PKEY_meth_get_verifyctx, EVP_PKEY_meth_get_encrypt, EVP_PKEY_meth_get_decrypt,

EVP_PKEY_meth_get_derive, EVP_PKEY_meth_get_ctrl, EVP_PKEY_meth_get_check

EVP_PKEY_meth_get_derive, EVP_PKEY_meth_get_ctrl, EVP_PKEY_meth_get_check,

EVP_PKEY_meth_remove

- manipulating EVP_PKEY_METHOD structure



=head1 SYNOPSIS
@@ -27,6 +28,7 @@ EVP_PKEY_meth_get_derive, EVP_PKEY_meth_get_ctrl, EVP_PKEY_meth_get_check 
 void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src);

 const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);

 int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);

 int EVP_PKEY_meth_remove(const EVP_PKEY_METHOD *pmeth);



 void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,

                             int (*init) (EVP_PKEY_CTX *ctx));
@@ -350,6 +352,9 @@ then the built-in objects. 


EVP_PKEY_meth_add0() adds B<pmeth> to the user defined stack of methods.



EVP_PKEY_meth_remove() removes an B<EVP_PKEY_METHOD> object added by

EVP_PKEY_meth_new().



The EVP_PKEY_meth_set functions set the corresponding fields of

B<EVP_PKEY_METHOD> structure with the arguments passed.
@@ -369,6 +374,9 @@ object or returns NULL if not found. 
EVP_PKEY_meth_add0() returns 1 if method is added successfully or 0

if an error occurred.



EVP_PKEY_meth_remove() returns 1 if method is removed successfully or

0 if an error occurred.



All EVP_PKEY_meth_set and EVP_PKEY_meth_get functions have no return

values. For the 'get' functions, function pointers are returned by

arguments.

include/openssl/evp.h

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