Fix compilation on sparc

Fixes #7966

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7997)
This commit is contained in:
Matt Caswell 2019-01-07 15:16:23 +00:00
parent 760e2d60e6
commit 87d06aed64
2 changed files with 5 additions and 2 deletions

View File

@ -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__)

View File

@ -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, \