Commit 7556b9df authored by Matt Caswell's avatar Matt Caswell
Browse files

Support EVP_MD_block_size() with providers 



Fixes #8565

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8604)
parent 5a2bd6bc

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ EVP_F_EVP_MAC_CTRL_STR:210:EVP_MAC_ctrl_str 
EVP_F_EVP_MAC_CTX_COPY:211:EVP_MAC_CTX_copy

EVP_F_EVP_MAC_CTX_NEW:213:EVP_MAC_CTX_new

EVP_F_EVP_MAC_INIT:212:EVP_MAC_init

EVP_F_EVP_MD_BLOCK_SIZE:229:EVP_MD_block_size

EVP_F_EVP_MD_CTX_COPY_EX:110:EVP_MD_CTX_copy_ex

EVP_F_EVP_MD_SIZE:162:EVP_MD_size

EVP_F_EVP_OPENINIT:102:EVP_OpenInit

crypto/evp/digest.c

+5 −0
Original line number Diff line number Diff line
@@ -549,6 +549,11 @@ static void *evp_md_from_dispatch(int mdtype, const OSSL_DISPATCH *fns, 
                break;

            md->size = OSSL_get_OP_digest_size(fns);

            break;

        case OSSL_FUNC_DIGEST_BLOCK_SIZE:

            if (md->dblock_size != NULL)

                break;

            md->dblock_size = OSSL_get_OP_digest_block_size(fns);

            break;

        }

    }

    if ((fncnt != 0 && fncnt != 5)

crypto/evp/evp_err.c

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static const ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTX_COPY, 0), "EVP_MAC_CTX_copy"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTX_NEW, 0), "EVP_MAC_CTX_new"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_INIT, 0), "EVP_MAC_init"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MD_BLOCK_SIZE, 0), "EVP_MD_block_size"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MD_CTX_COPY_EX, 0), "EVP_MD_CTX_copy_ex"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MD_SIZE, 0), "EVP_MD_size"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_OPENINIT, 0), "EVP_OpenInit"},

crypto/evp/evp_lib.c

+8 −0
Original line number Diff line number Diff line
@@ -298,6 +298,14 @@ int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx) 


int EVP_MD_block_size(const EVP_MD *md)

{

    if (md == NULL) {

        EVPerr(EVP_F_EVP_MD_BLOCK_SIZE, EVP_R_MESSAGE_DIGEST_IS_NULL);

        return -1;

    }



    if (md->prov != NULL && md->dblock_size != NULL)

        return (int)md->dblock_size();



    return md->block_size;

}

crypto/include/internal/evp_int.h

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ struct evp_md_st { 
    OSSL_OP_digest_freectx_fn *freectx;

    OSSL_OP_digest_dupctx_fn *dupctx;

    OSSL_OP_digest_size_fn *size;

    OSSL_OP_digest_block_size_fn *dblock_size;



} /* EVP_MD */ ;