package/libs/openssl/patches/400-eng_devcrypto-save-ioctl-if-EVP_MD_.FLAG_ONESHOT.patch

   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
   5
   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.
  10
  11 Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
  12
  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)
  16
  17 diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
  18 index a727c6f646..a2c9a966f7 100644
  19 --- a/crypto/engine/eng_devcrypto.c
  20 +++ b/crypto/engine/eng_devcrypto.c
  21 @@ -461,6 +461,7 @@ struct digest_ctx {
  22      struct session_op sess;
  23      /* This signals that the init function was called, not that it succeeded. */
  24      int init_called;
  25 +    unsigned char digest_res[HASH_MAX_LEN];
  26  };
  27
  28  static const struct digest_data_st {
  29 @@ -564,12 +565,15 @@ static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count)
  30      if (digest_ctx == NULL)
  31          return 0;
  32
  33 -    if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) < 0) {
  34 -        SYSerr(SYS_F_IOCTL, errno);
  35 -        return 0;
  36 +    if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
  37 +        if (digest_op(digest_ctx, data, count, digest_ctx->digest_res, 0) >= 0)
  38 +            return 1;
  39 +    } else if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) >= 0) {
  40 +        return 1;
  41      }
  42
  43 -    return 1;
  44 +    SYSerr(SYS_F_IOCTL, errno);
  45 +    return 0;
  46  }
  47
  48  static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
  49 @@ -579,7 +583,10 @@ static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
  50
  51      if (md == NULL || digest_ctx == NULL)
  52          return 0;
  53 -    if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {
  54 +
  55 +    if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
  56 +        memcpy(md, digest_ctx->digest_res, EVP_MD_CTX_size(ctx));
  57 +    } else if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {
  58          SYSerr(SYS_F_IOCTL, errno);
  59          return 0;
  60      }