From 316d527ff9b6597105df399fc222ea328cd827bf Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 5 Jun 2018 20:00:46 +0200 Subject: [PATCH 1/1] crypto/ppccap.c: wire new ChaCha20_ctr32_vsx. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6419) --- crypto/ppccap.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/crypto/ppccap.c b/crypto/ppccap.c index f8b7c007a5..8b7d765c3a 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -90,13 +90,18 @@ void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp, void ChaCha20_ctr32_vmx(unsigned char *out, const unsigned char *inp, size_t len, const unsigned int key[8], const unsigned int counter[4]); +void ChaCha20_ctr32_vsx(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, size_t len, const unsigned int key[8], const unsigned int counter[4]) { - OPENSSL_ppccap_P & PPC_ALTIVEC - ? ChaCha20_ctr32_vmx(out, inp, len, key, counter) - : ChaCha20_ctr32_int(out, inp, len, key, counter); + OPENSSL_ppccap_P & PPC_CRYPTO207 + ? ChaCha20_ctr32_vsx(out, inp, len, key, counter) + : OPENSSL_ppccap_P & PPC_ALTIVEC + ? ChaCha20_ctr32_vmx(out, inp, len, key, counter) + : ChaCha20_ctr32_int(out, inp, len, key, counter); } #endif -- 2.34.1