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

eng_devcrypto: save ioctl if EVP_MD_..FLAG_ONESHOT 



Since each ioctl causes a context switch, slowing things down, if
EVP_MD_CTX_FLAG_ONESHOT is set, then:
 - call the ioctl in digest_update, saving the result; and
 - just copy the result in digest_final, instead of using another ioctl.

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)
parent 16e252a0

crypto/engine/eng_devcrypto.c

+12 −5
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ struct digest_ctx { 
    struct session_op sess;

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

    int init_called;

    unsigned char digest_res[HASH_MAX_LEN];

};



static const struct digest_data_st {
@@ -539,12 +540,15 @@ static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count) 
    if (digest_ctx == NULL)

        return 0;



    if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) < 0) {

        SYSerr(SYS_F_IOCTL, errno);

        return 0;

    if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {

        if (digest_op(digest_ctx, data, count, digest_ctx->digest_res, 0) >= 0)

            return 1;

    } else if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) >= 0) {

        return 1;

    }



    return 1;

    SYSerr(SYS_F_IOCTL, errno);

    return 0;

}



static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
@@ -554,7 +558,10 @@ static int digest_final(EVP_MD_CTX *ctx, unsigned char *md) 


    if (md == NULL || digest_ctx == NULL)

        return 0;

    if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {



    if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {

        memcpy(md, digest_ctx->digest_res, EVP_MD_CTX_size(ctx));

    } else if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {

        SYSerr(SYS_F_IOCTL, errno);

        return 0;

    }