Commit 72ff0a54 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add function for setting the EVP_PKEY_ASN1_METHOD raw key getter functions 



EVP_PKEY_asn1_set_get_priv_key() and EVP_PKEY_asn1_set_get_pub_key()

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6394)
parent edb77a4d

crypto/asn1/ameth_lib.c

+16 −0
Original line number Diff line number Diff line
@@ -417,3 +417,19 @@ void EVP_PKEY_asn1_set_set_pub_key(EVP_PKEY_ASN1_METHOD *ameth, 
{

    ameth->set_pub_key = set_pub_key;

}



void EVP_PKEY_asn1_set_get_priv_key(EVP_PKEY_ASN1_METHOD *ameth,

                                    int (*get_priv_key) (const EVP_PKEY *pk,

                                                         unsigned char *priv,

                                                         size_t *len))

{

    ameth->get_priv_key = get_priv_key;

}



void EVP_PKEY_asn1_set_get_pub_key(EVP_PKEY_ASN1_METHOD *ameth,

                                   int (*get_pub_key) (const EVP_PKEY *pk,

                                                       unsigned char *pub,

                                                       size_t *len))

{

    ameth->get_pub_key = get_pub_key;

}

doc/man3/EVP_PKEY_ASN1_METHOD.pod

+15 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ EVP_PKEY_asn1_set_param_check, 
EVP_PKEY_asn1_set_security_bits,

EVP_PKEY_asn1_set_set_priv_key,

EVP_PKEY_asn1_set_set_pub_key,

EVP_PKEY_asn1_set_get_priv_key,

EVP_PKEY_asn1_set_get_pub_key,

EVP_PKEY_get0_asn1

- manipulating and registering EVP_PKEY_ASN1_METHOD structure
@@ -125,6 +127,16 @@ EVP_PKEY_get0_asn1 
                                                        const unsigned char *pub,

                                                        size_t len));



 void EVP_PKEY_asn1_set_get_priv_key(EVP_PKEY_ASN1_METHOD *ameth,

                                     int (*get_priv_key) (const EVP_PKEY *pk,

                                                          unsigned char *priv,

                                                          size_t *len));



 void EVP_PKEY_asn1_set_get_pub_key(EVP_PKEY_ASN1_METHOD *ameth,

                                    int (*get_pub_key) (const EVP_PKEY *pk,

                                                        unsigned char *pub,

                                                        size_t *len));



 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(const EVP_PKEY *pkey);



=head1 DESCRIPTION
@@ -390,8 +402,9 @@ EVP_PKEY_asn1_set_param(), EVP_PKEY_asn1_set_free(), 
EVP_PKEY_asn1_set_ctrl(), EVP_PKEY_asn1_set_item(),

EVP_PKEY_asn1_set_siginf(), EVP_PKEY_asn1_set_check(),

EVP_PKEY_asn1_set_public_check(), EVP_PKEY_asn1_set_param_check(),

EVP_PKEY_asn1_set_security_bits(), EVP_PKEY_asn1_set_set_priv_key() and

EVP_PKEY_asn1_set_set_pub_key() set the diverse methods of the given

EVP_PKEY_asn1_set_security_bits(), EVP_PKEY_asn1_set_set_priv_key(),

EVP_PKEY_asn1_set_set_pub_key(), EVP_PKEY_asn1_set_get_priv_key() and

EVP_PKEY_asn1_set_get_pub_key() set the diverse methods of the given

B<EVP_PKEY_ASN1_METHOD> object.



EVP_PKEY_get0_asn1() finds the B<EVP_PKEY_ASN1_METHOD> associated

include/openssl/evp.h

+8 −0
Original line number Diff line number Diff line
@@ -1238,6 +1238,14 @@ void EVP_PKEY_asn1_set_set_pub_key(EVP_PKEY_ASN1_METHOD *ameth, 
                                   int (*set_pub_key) (EVP_PKEY *pk,

                                                       const unsigned char *pub,

                                                       size_t len));

void EVP_PKEY_asn1_set_get_priv_key(EVP_PKEY_ASN1_METHOD *ameth,

                                    int (*get_priv_key) (const EVP_PKEY *pk,

                                                         unsigned char *priv,

                                                         size_t *len));

void EVP_PKEY_asn1_set_get_pub_key(EVP_PKEY_ASN1_METHOD *ameth,

                                   int (*get_pub_key) (const EVP_PKEY *pk,

                                                       unsigned char *pub,

                                                       size_t *len));



void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,

                                     int (*pkey_security_bits) (const EVP_PKEY

util/libcrypto.num

+2 −0
Original line number Diff line number Diff line
@@ -4565,3 +4565,5 @@ X509_LOOKUP_meth_set_init 4516 1_1_0i EXIST::FUNCTION: 
X509_OBJECT_set1_X509_CRL               4517	1_1_0i	EXIST::FUNCTION:

EVP_PKEY_get_raw_public_key             4518	1_1_1	EXIST::FUNCTION:

EVP_PKEY_get_raw_private_key            4519	1_1_1	EXIST::FUNCTION:

EVP_PKEY_asn1_set_get_priv_key          4520	1_1_1	EXIST::FUNCTION:

EVP_PKEY_asn1_set_get_pub_key           4521	1_1_1	EXIST::FUNCTION: