From: Andy Polyakov <appro@openssl.org>
Date: Wed, 27 Apr 2016 13:42:36 +0000 (+0200)
Subject: crypto/ppccap.c: permit build with no-chacha and no-poly1305.
X-Git-Tag: OpenSSL_1_1_0-pre6~1006
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa79c543d28c3543b3fcaa8adf5fe3d43cdba1c8;p=oweals%2Fopenssl.git

crypto/ppccap.c: permit build with no-chacha and no-poly1305.

RT#4508

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 2c98daf5b4..c825568e02 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -79,6 +79,7 @@ void sha512_block_data_order(void *ctx, const void *inp, size_t len)
         sha512_block_ppc(ctx, inp, len);
 }
 
+#ifndef OPENSSL_NO_CHACHA
 void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp,
                         size_t len, const unsigned int key[8],
                         const unsigned int counter[4]);
@@ -93,7 +94,9 @@ void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp,
         ? ChaCha20_ctr32_vmx(out, inp, len, key, counter)
         : ChaCha20_ctr32_int(out, inp, len, key, counter);
 }
+#endif
 
+#ifndef OPENSSL_NO_POLY1305
 void poly1305_init_int(void *ctx, const unsigned char key[16]);
 void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
                          unsigned int padbit);
@@ -117,6 +120,7 @@ int poly1305_init(void *ctx, const unsigned char key[16], void *func[2])
     }
     return 1;
 }
+#endif
 
 static sigjmp_buf ill_jmp;
 static void ill_handler(int sig)