diff options
| -rw-r--r-- | crypto/hmac/hmac_s390x.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/crypto/hmac/hmac_s390x.c b/crypto/hmac/hmac_s390x.c index 5db7e9a221..02e1cd1dd6 100644 --- a/crypto/hmac/hmac_s390x.c +++ b/crypto/hmac/hmac_s390x.c @@ -7,10 +7,16 @@ * https://www.openssl.org/source/license.html */ +/* We need to use some engine deprecated APIs */ +#define OPENSSL_SUPPRESS_DEPRECATED + #include "crypto/s390x_arch.h" #include "hmac_local.h" #include "openssl/obj_mac.h" #include "openssl/evp.h" +#if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE) +# include <openssl/engine.h> +#endif #ifdef OPENSSL_HMAC_S390X @@ -63,6 +69,31 @@ static void s390x_call_kmac(HMAC_CTX *ctx, const unsigned char *in, size_t len) ctx->plat.s390x.ikp = 1; } +static int s390x_check_engine_used(const EVP_MD *md, ENGINE *impl) +{ +# if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE) + const EVP_MD *d; + + if (impl != NULL) { + if (!ENGINE_init(impl)) + return 0; + } else { + impl = ENGINE_get_digest_engine(EVP_MD_get_type(md)); + } + + if (impl == NULL) + return 0; + + d = ENGINE_get_digest(impl, EVP_MD_get_type(md)); + ENGINE_finish(impl); + + if (d != NULL) + return 1; +# endif + + return 0; +} + int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len, ENGINE *impl) { unsigned char *key_param; @@ -72,6 +103,11 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len, ENGINE *impl) if (ctx->plat.s390x.fc == 0) return -1; /* Not supported by kmac instruction */ + if (s390x_check_engine_used(ctx->md, impl)) { + ctx->plat.s390x.fc = 0; + return -1; /* An engine handles the digest, disable acceleration */ + } + ctx->plat.s390x.blk_size = EVP_MD_get_block_size(ctx->md); if (ctx->plat.s390x.blk_size < 0) return 0; |