Commit 5e006082 authored by Richard Levitte's avatar Richard Levitte
Browse files

EVP_PKEY_ASN1_METHOD: add functions to set siginf_set and pkey_check methods 



Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/4589)
parent f403feea

crypto/asn1/ameth_lib.c

+18 −0
Original line number Diff line number Diff line
@@ -251,6 +251,10 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, 
    dst->item_sign = src->item_sign;

    dst->item_verify = src->item_verify;



    dst->siginf_set = src->siginf_set;



    dst->pkey_check = src->pkey_check;



}



void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
@@ -359,3 +363,17 @@ void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth, 
    ameth->item_sign = item_sign;

    ameth->item_verify = item_verify;

}



void EVP_PKEY_asn1_set_siginf(EVP_PKEY_ASN1_METHOD *ameth,

                              int (*siginf_set) (X509_SIG_INFO *siginf,

                                                 const X509_ALGOR *alg,

                                                 const ASN1_STRING *sig))

{

    ameth->siginf_set = siginf_set;

}



void EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth,

                             int (*pkey_check) (const EVP_PKEY *pk))

{

    ameth->pkey_check = pkey_check;

}

include/openssl/evp.h

+8 −0
Original line number Diff line number Diff line
@@ -1198,6 +1198,14 @@ void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth, 
                                              X509_ALGOR *alg2,

                                              ASN1_BIT_STRING *sig));



void EVP_PKEY_asn1_set_siginf(EVP_PKEY_ASN1_METHOD *ameth,

                              int (*siginf_set) (X509_SIG_INFO *siginf,

                                                 const X509_ALGOR *alg,

                                                 const ASN1_STRING *sig));



void EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth,

                             int (*pkey_check) (const EVP_PKEY *pk));



void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,

                                     int (*pkey_security_bits) (const EVP_PKEY

                                                                *pk));

util/libcrypto.num

+2 −0
Original line number Diff line number Diff line
@@ -4418,3 +4418,5 @@ RAND_POOL_add_begin 4362 1_1_1 EXIST::FUNCTION: 
RAND_POOL_add_end                       4363	1_1_1	EXIST::FUNCTION:

RAND_POOL_acquire_entropy               4364	1_1_1	EXIST::FUNCTION:

OPENSSL_sk_new_reserve                  4365	1_1_1	EXIST::FUNCTION:

EVP_PKEY_asn1_set_check                 4366	1_1_1	EXIST::FUNCTION:

EVP_PKEY_asn1_set_siginf                4367	1_1_1	EXIST::FUNCTION: