commit 365f95ad53c2216e6fadeccc9c0d73374a18bd66
author Andy Polyakov <appro@openssl.org> Sat Apr 23 19:22:53 2016 +0200
committer Andy Polyakov <appro@openssl.org> Sat Jul 16 23:37:31 2016 +0200
tree 8a79a28f7857c3ade19df963d0b8bb5e0b799a90
parent d41de45a335a7275c66a21287ae13a84e45921b5

evp/e_aes.c: wire new CBC and CTR subroutines from aesfx-sparcv9.

Reviewed-by: Rich Salz <rsalz@openssl.org>

crypto/evp/e_aes.c

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 7b66c9e..f504c68 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -555,6 +555,8 @@
 # define HWAES_set_decrypt_key aes_fx_set_decrypt_key
 # define HWAES_encrypt aes_fx_encrypt
 # define HWAES_decrypt aes_fx_decrypt
+# define HWAES_cbc_encrypt aes_fx_cbc_encrypt
+# define HWAES_ctr32_encrypt_blocks aes_fx_ctr32_encrypt_blocks
 
 # define SPARC_AES_CAPABLE       (OPENSSL_sparcv9cap_P[1] & CFR_AES)
 
@@ -2424,7 +2426,7 @@
                        const unsigned char L_[][16],
                        unsigned char checksum[16]);
 #  else
-#    define HWAES_ocb_encrypt NULL
+#    define HWAES_ocb_encrypt ((ocb128_f)NULL)
 #  endif
 #  ifdef HWAES_ocb_decrypt
 void HWAES_ocb_decrypt(const unsigned char *in, unsigned char *out,
@@ -2434,7 +2436,7 @@
                        const unsigned char L_[][16],
                        unsigned char checksum[16]);
 #  else
-#    define HWAES_ocb_decrypt NULL
+#    define HWAES_ocb_decrypt ((ocb128_f)NULL)
 #  endif
 # endif