Commit 3418f7b7 authored by Sergey Agievich's avatar Sergey Agievich Committed by Dr. Stephen Henson
Browse files

Add funtions to set item_sign and item_verify 



PR#3872

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarStephen Henson <steve@openssl.org>
(cherry picked from commit ad0fb7f4988c8a717fe6bcb035304385fbdaef41)

Conflicts:
	crypto/asn1/ameth_lib.c
parent 133dce44

crypto/asn1/ameth_lib.c

+18 −0
Original line number Diff line number Diff line
@@ -466,3 +466,21 @@ void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, 
{

    ameth->pkey_security_bits = pkey_security_bits;

}



void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,

                            int (*item_verify) (EVP_MD_CTX *ctx,

                                                const ASN1_ITEM *it,

                                                void *asn,

                                                X509_ALGOR *a,

                                                ASN1_BIT_STRING *sig,

                                                EVP_PKEY *pkey),

                            int (*item_sign) (EVP_MD_CTX *ctx,

                                              const ASN1_ITEM *it,

                                              void *asn,

                                              X509_ALGOR *alg1,

                                              X509_ALGOR *alg2,

                                              ASN1_BIT_STRING *sig))

{

    ameth->item_sign = item_sign;

    ameth->item_verify = item_verify;

}

include/openssl/evp.h

+13 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,19 @@ void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, 
void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,

                            int (*pkey_ctrl) (EVP_PKEY *pkey, int op,

                                              long arg1, void *arg2));

void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,

                            int (*item_verify) (EVP_MD_CTX *ctx,

                                                const ASN1_ITEM *it,

                                                void *asn,

                                                X509_ALGOR *a,

                                                ASN1_BIT_STRING *sig,

                                                EVP_PKEY *pkey),

                            int (*item_sign) (EVP_MD_CTX *ctx,

                                              const ASN1_ITEM *it,

                                              void *asn,

                                              X509_ALGOR *alg1,

                                              X509_ALGOR *alg2,

                                              ASN1_BIT_STRING *sig));



void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,

                                     int (*pkey_security_bits) (const EVP_PKEY