Commit 68b02a8a authored by Eneas U de Queiroz's avatar Eneas U de Queiroz Committed by Richard Levitte
Browse files

eng_devcrypto: fix copy of unitilialized digest 



If the source ctx has not been initialized, don't initialize the copy
either.

Signed-off-by: default avatarEneas U de Queiroz <cote2004-github@yahoo.com>

Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7585)

(cherry picked from commit ae818369)
parent add2ab1f

crypto/engine/eng_devcrypto.c

+4 −8
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 


struct digest_ctx {

    struct session_op sess;

    int init;

    /* This signals that the init function was called, not that it succeeded. */

    int init_called;

};



static const struct digest_data_st {
@@ -403,7 +404,7 @@ static int digest_init(EVP_MD_CTX *ctx) 
    const struct digest_data_st *digest_d =

        get_digest_data(EVP_MD_CTX_type(ctx));



    digest_ctx->init = 1;

    digest_ctx->init_called = 1;



    memset(&digest_ctx->sess, 0, sizeof(digest_ctx->sess));

    digest_ctx->sess.mac = digest_d->devcryptoid;
@@ -476,14 +477,9 @@ static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) 
        (struct digest_ctx *)EVP_MD_CTX_md_data(to);

    struct cphash_op cphash;



    if (digest_from == NULL)

    if (digest_from == NULL || digest_from->init_called != 1)

        return 1;



    if (digest_from->init != 1) {

        SYSerr(SYS_F_IOCTL, EINVAL);

        return 0;

    }



    if (!digest_init(to)) {

        SYSerr(SYS_F_IOCTL, errno);

        return 0;