17a6ca12d3
This changes the configuration of engines from the global openssl.cnf to files in the /etc/ssl/engines.cnf.d directory. The engines.cnf file has the list of enabled engines, while each engine has its own configuration file installed under /etc/ssl/engines.cnf.d. Patches were refreshed with --zero-commit. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
|
Date: Mon, 5 Nov 2018 15:54:17 -0200
|
|
Subject: 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: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
|
|
|
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/7585)
|
|
|
|
diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
|
|
--- a/crypto/engine/eng_devcrypto.c
|
|
+++ b/crypto/engine/eng_devcrypto.c
|
|
@@ -461,6 +461,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 {
|
|
@@ -564,12 +565,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)
|
|
@@ -579,7 +583,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;
|
|
}
|