[openssl] master update

shane.lontis at oracle.com shane.lontis at oracle.com
Sun Sep 15 09:30:31 UTC 2019


The branch master has been updated
       via  f407a9a998f95f693a7127bc76a2c922dfaedbdb (commit)
      from  64c1e74572f16a3e7c225f66fe85a3451ad39e68 (commit)


- Log -----------------------------------------------------------------
commit f407a9a998f95f693a7127bc76a2c922dfaedbdb
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Sun Sep 15 19:29:02 2019 +1000

    Fix aesni_xts compile error
    
    Block copy bug..
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9900)

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

Summary of changes:
 providers/common/ciphers/cipher_aes_xts_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/providers/common/ciphers/cipher_aes_xts_hw.c b/providers/common/ciphers/cipher_aes_xts_hw.c
index 2b06c5bb4b..9ac70c4fa8 100644
--- a/providers/common/ciphers/cipher_aes_xts_hw.c
+++ b/providers/common/ciphers/cipher_aes_xts_hw.c
@@ -84,7 +84,7 @@ static int cipher_hw_aesni_xts_initkey(PROV_CIPHER_CTX *ctx,
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
 
     XTS_SET_KEY_FN(aesni_set_encrypt_key, aesni_set_decrypt_key,
-                   aesni_xts_encrypt, aesni_decrypt,
+                   aesni_encrypt, aesni_decrypt,
                    aesni_xts_encrypt, aesni_xts_decrypt);
     return 1;
 }


More information about the openssl-commits mailing list