diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-19 21:21:39 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-19 21:21:39 +1000 |
| commit | f8c0218f09e190a2efb28302f6c9737efe151d27 (patch) | |
| tree | 024fe0b11da2cfa52b8e1282785a5e67eb6ffecd | |
| parent | 4ed838915be263b3ebf847b6ada2ab2d3debec4c (diff) | |
| download | openssl-f8c0218f09e190a2efb28302f6c9737efe151d27.zip openssl-f8c0218f09e190a2efb28302f6c9737efe151d27.tar.gz openssl-f8c0218f09e190a2efb28302f6c9737efe151d27.tar.bz2 | |
Fix Solaris compile errors in provider ciphers
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9941)
| -rw-r--r-- | providers/common/ciphers/cipher_aes_hw_t4.inc | 2 | ||||
| -rw-r--r-- | providers/common/ciphers/cipher_tdes_hw.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/providers/common/ciphers/cipher_aes_hw_t4.inc b/providers/common/ciphers/cipher_aes_hw_t4.inc index 8722fa0..21b6727 100644 --- a/providers/common/ciphers/cipher_aes_hw_t4.inc +++ b/providers/common/ciphers/cipher_aes_hw_t4.inc @@ -92,4 +92,4 @@ static const PROV_CIPHER_HW aes_t4_##mode = { \ }; #define PROV_CIPHER_HW_select(mode) \ if (SPARC_AES_CAPABLE) \ - return aes_t4_##mode; + return &aes_t4_##mode; diff --git a/providers/common/ciphers/cipher_tdes_hw.c b/providers/common/ciphers/cipher_tdes_hw.c index 9802012..92b6de2 100644 --- a/providers/common/ciphers/cipher_tdes_hw.c +++ b/providers/common/ciphers/cipher_tdes_hw.c @@ -27,8 +27,8 @@ int cipher_hw_tdes_ede3_initkey(PROV_CIPHER_CTX *ctx, const unsigned char *key, des_t4_key_expand(&deskey[0], &tctx->ks1); des_t4_key_expand(&deskey[1], &tctx->ks2); des_t4_key_expand(&deskey[2], &tctx->ks3); - dat->tstream.cbc = enc ? des_t4_ede3_cbc_encrypt : - des_t4_ede3_cbc_decrypt; + tctx->tstream.cbc = ctx->enc ? des_t4_ede3_cbc_encrypt : + des_t4_ede3_cbc_decrypt; return 1; } } |