1 From f14345422747a495a52f9237a43b8be189f21912 Mon Sep 17 00:00:00 2001
2 From: Eneas U de Queiroz <cote2004-github@yahoo.com>
3 Date: Mon, 5 Nov 2018 15:54:17 -0200
4 Subject: eng_devcrypto: save ioctl if EVP_MD_..FLAG_ONESHOT
6 Since each ioctl causes a context switch, slowing things down, if
7 EVP_MD_CTX_FLAG_ONESHOT is set, then:
8 - call the ioctl in digest_update, saving the result; and
9 - just copy the result in digest_final, instead of using another ioctl.
11 Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
13 Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
14 Reviewed-by: Richard Levitte <levitte@openssl.org>
15 (Merged from https://github.com/openssl/openssl/pull/7585)
17 --- a/crypto/engine/eng_devcrypto.c
18 +++ b/crypto/engine/eng_devcrypto.c
19 @@ -461,6 +461,7 @@ struct digest_ctx {
20 struct session_op sess;
21 /* This signals that the init function was called, not that it succeeded. */
23 + unsigned char digest_res[HASH_MAX_LEN];
26 static const struct digest_data_st {
27 @@ -564,12 +565,15 @@ static int digest_update(EVP_MD_CTX *ctx
28 if (digest_ctx == NULL)
31 - if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) < 0) {
32 - SYSerr(SYS_F_IOCTL, errno);
34 + if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
35 + if (digest_op(digest_ctx, data, count, digest_ctx->digest_res, 0) >= 0)
37 + } else if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) >= 0) {
42 + SYSerr(SYS_F_IOCTL, errno);
46 static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
47 @@ -579,7 +583,10 @@ static int digest_final(EVP_MD_CTX *ctx,
49 if (md == NULL || digest_ctx == NULL)
51 - if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {
53 + if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
54 + memcpy(md, digest_ctx->digest_res, EVP_MD_CTX_size(ctx));
55 + } else if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {
56 SYSerr(SYS_F_IOCTL, errno);