Commit 81c79453 authored by Paul Yang's avatar Paul Yang
Browse files

Allow EVP_MD_CTX_set_pkey_ctx to accept NULL pctx 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7113)
parent 571286b0

crypto/evp/evp_lib.c

+14 −2
Original line number Diff line number Diff line
@@ -462,9 +462,21 @@ EVP_PKEY_CTX *EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx) 


void EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx)

{

    /*

     * it's reasonable to set NULL pctx (a.k.a clear the ctx->pctx), so

     * we have to deal with the cleanup job here.

     */

    if (!EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX))

        EVP_PKEY_CTX_free(ctx->pctx);



    ctx->pctx = pctx;



    if (pctx != NULL) {

        /* make sure pctx is not freed when destroying EVP_MD_CTX */

        EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);

    } else {

        EVP_MD_CTX_clear_flags(ctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);

    }

}



void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx)

doc/man3/EVP_DigestInit.pod

+5 −3
Original line number Diff line number Diff line
@@ -186,8 +186,10 @@ B<ASN1_OBJECT> structure respectively. 


Assigns an B<EVP_PKEY_CTX> to B<EVP_MD_CTX>. This is usually used to provide

a customzied B<EVP_PKEY_CTX> to L<EVP_DigestSignInit(3)> or

L<EVP_DigestVerifyInit(3)>. The B<EVP_PKEY_CTX> passed to this function should

be freed by the caller.

L<EVP_DigestVerifyInit(3)>. The B<pctx> passed to this function should be freed

by the caller. A null B<pctx> pointer is also allowed to clear the B<EVP_PKEY_CTX>

assigned to B<ctx>. In such case, freeing the cleared B<EVP_PKEY_CTX> or not

depends on how the B<EVP_PKEY_CTX> is created.



=back
@@ -374,7 +376,7 @@ later, so now EVP_sha1() can be used with RSA and DSA. 


EVP_dss1() was removed in OpenSSL 1.1.0.



EVP_MD_CTX_set_pkey_ctx() is added in 1.1.1.

EVP_MD_CTX_set_pkey_ctx() was added in 1.1.1.



=head1 COPYRIGHT