[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d95743047ef25fbbff9bf27aaa535ea56aa26665 (commit)
       via  374d543f291ae44fd63ab7a17f5187f343b79293 (commit)
      from  290a0419f0c13a30fb3a1d1a279125c8aeafd17e (commit)


- Log -----------------------------------------------------------------
commit d95743047ef25fbbff9bf27aaa535ea56aa26665
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 10 09:20:07 2017 +0100

    Only enable CRYPTO_3DES_ECB if that name is an existing macro
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2203)

commit 374d543f291ae44fd63ab7a17f5187f343b79293
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 10 08:24:16 2017 +0100

    Small fixes of cryptodev engine
    
    - guard CRYPTO_3DES_CBC
    - add a missing cast
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2203)

-----------------------------------------------------------------------

Summary of changes:
 crypto/engine/eng_cryptodev.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index 288718c..94480e9 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -176,10 +176,20 @@ static struct {
 } ciphers[] = {
     {CRYPTO_ARC4, NID_rc4, 0, 16},
     {CRYPTO_DES_CBC, NID_des_cbc, 8, 8},
+# if defined(CRYPTO_3DES_CBC)
     {CRYPTO_3DES_CBC, NID_des_ede3_cbc, 8, 24},
-# if !defined(CRYPTO_ALGORITHM_MIN) || defined(CRYPTO_3DES_ECB)
+# endif
+
+/*
+ * The marvell-kirkwood armv5 platform doesn't seem to have CRYPTO_3DES_ECB.
+ * Unfortunately, there is no way to detect this, except on BSD, where the
+ * crypto identities are implemented as macros.  All other cryptodev
+ * implementations will be without this one.
+ */
+# if defined(CRYPTO_3DES_ECB)
     {CRYPTO_3DES_ECB, NID_des_ede3_ecb, 0, 24},
 # endif
+
     {CRYPTO_AES_CBC, NID_aes_128_cbc, 16, 16},
     {CRYPTO_AES_CBC, NID_aes_192_cbc, 16, 24},
     {CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32},
@@ -1144,7 +1154,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) {