From: Matt Caswell Date: Mon, 7 Jan 2019 15:16:23 +0000 (+0000) Subject: Fix compilation on sparc X-Git-Tag: openssl-3.0.0-alpha1~2649 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=87d06aed64395afcd9ee4e7c699950dd57278259 Fix compilation on sparc Fixes #7966 Reviewed-by: Tim Hudson Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/7997) --- diff --git a/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4 index 92b9678dad..9a17fac643 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 - #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 6080d1632d..8dc523528b 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, \