From 8c95977fbf401df72c9a236348130ba4483d7691 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Tue, 17 Sep 2019 13:34:47 +1000 Subject: [PATCH] Fix Solaris aes_hw_t4 compile issue Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9910) --- providers/common/ciphers/cipher_aes_hw_t4.inc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/providers/common/ciphers/cipher_aes_hw_t4.inc b/providers/common/ciphers/cipher_aes_hw_t4.inc index f7e363e5c3..8722fa0add 100644 --- a/providers/common/ciphers/cipher_aes_hw_t4.inc +++ b/providers/common/ciphers/cipher_aes_hw_t4.inc @@ -17,34 +17,35 @@ static int cipher_hw_aes_t4_initkey(PROV_CIPHER_CTX *dat, { int ret, bits; PROV_AES_CTX *adat = (PROV_AES_CTX *)dat; + AES_KEY *ks = &adat->ks.ks; - dat->ks = &adat->ks.ks; + dat->ks = (const void *)ks; /* used by cipher_hw_generic_XXX */ bits = keylen * 8; if ((dat->mode == EVP_CIPH_ECB_MODE || dat->mode == EVP_CIPH_CBC_MODE) && !dat->enc) { ret = 0; - aes_t4_set_decrypt_key(key, bits, dat->ks); - dat->block = (block128_f) aes_t4_decrypt; + aes_t4_set_decrypt_key(key, bits, ks); + dat->block = (block128_f)aes_t4_decrypt; switch (bits) { case 128: dat->stream.cbc = dat->mode == EVP_CIPH_CBC_MODE ? - (cbc128_f) aes128_t4_cbc_decrypt : NULL; + (cbc128_f)aes128_t4_cbc_decrypt : NULL; break; case 192: dat->stream.cbc = dat->mode == EVP_CIPH_CBC_MODE ? - (cbc128_f) aes192_t4_cbc_decrypt : NULL; + (cbc128_f)aes192_t4_cbc_decrypt : NULL; break; case 256: dat->stream.cbc = dat->mode == EVP_CIPH_CBC_MODE ? - (cbc128_f) aes256_t4_cbc_decrypt : NULL; + (cbc128_f)aes256_t4_cbc_decrypt : NULL; break; default: ret = -1; } } else { ret = 0; - aes_t4_set_encrypt_key(key, bits, dat->ks); + aes_t4_set_encrypt_key(key, bits, ks); dat->block = (block128_f)aes_t4_encrypt; switch (bits) { case 128: -- 2.25.1