From 374d543f291ae44fd63ab7a17f5187f343b79293 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 10 Jan 2017 08:24:16 +0100 Subject: [PATCH] Small fixes of cryptodev engine - guard CRYPTO_3DES_CBC - add a missing cast Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2203) --- crypto/engine/eng_cryptodev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index 288718c762..e0e9ce471b 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -176,7 +176,9 @@ static struct { } ciphers[] = { {CRYPTO_ARC4, NID_rc4, 0, 16}, {CRYPTO_DES_CBC, NID_des_cbc, 8, 8}, +# if !defined(CRYPTO_ALGORITHM_MIN) || defined(CRYPTO_3DES_CBC) {CRYPTO_3DES_CBC, NID_des_ede3_cbc, 8, 24}, +# endif # if !defined(CRYPTO_ALGORITHM_MIN) || defined(CRYPTO_3DES_ECB) {CRYPTO_3DES_ECB, NID_des_ede3_ecb, 0, 24}, # endif @@ -1144,7 +1146,7 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) cryp.ses = sess->ses; cryp.flags = 0; cryp.len = state->mac_len; - cryp.src = state->mac_data; + cryp.src = (void *)state->mac_data; cryp.dst = NULL; cryp.mac = (void *)md; if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { -- 2.25.1