[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  87d06aed64395afcd9ee4e7c699950dd57278259 (commit)
      from  760e2d60e62511a6fb96f547f6730d05eb5f47ec (commit)


- Log -----------------------------------------------------------------
commit 87d06aed64395afcd9ee4e7c699950dd57278259
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Jan 7 15:16:23 2019 +0000

    Fix compilation on sparc
    
    Fixes #7966
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7997)

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

Summary of changes:
 crypto/des/asm/des_enc.m4 | 2 --
 crypto/evp/e_aes.c        | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4
index 92b9678..9a17fac 100644
--- a/crypto/des/asm/des_enc.m4
+++ b/crypto/des/asm/des_enc.m4
@@ -29,8 +29,6 @@
 .ident "des_enc.m4 2.1"
 .file  "des_enc-sparc.S"
 
-#include <openssl/opensslconf.h>
-
 #if defined(__SUNPRO_C) && defined(__sparcv9)
 # define ABI64  /* They've said -xarch=v9 at command line */
 #elif defined(__GNUC__) && defined(__arch64__)
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 6080d16..8dc5235 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -927,6 +927,11 @@ static int aes_t4_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                              const unsigned char *in, size_t len);
 # endif                        /* OPENSSL_NO_OCB */
 
+# ifndef OPENSSL_NO_SIV
+#  define aes_t4_siv_init_key aes_siv_init_key
+#  define aes_t4_siv_cipher aes_siv_cipher
+# endif /* OPENSSL_NO_SIV */
+
 # define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
 static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
         nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \