From: Matt Caswell <matt@openssl.org>
Date: Fri, 25 Aug 2017 10:02:47 +0000 (+0100)
Subject: Fix no-chacha and no-poly1305
X-Git-Tag: OpenSSL_1_1_1-pre1~768
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=0139ce7c92f5570ce1513cfe776df94460842ce0

Fix no-chacha and no-poly1305

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4251)
---

diff --git a/test/bio_enc_test.c b/test/bio_enc_test.c
index 8474dc516e..282e8dac61 100644
--- a/test/bio_enc_test.c
+++ b/test/bio_enc_test.c
@@ -202,15 +202,19 @@ static int test_bio_enc_aes_256_ofb(int idx)
     return do_test_bio_cipher(EVP_aes_256_ofb(), idx);
 }
 
+# ifndef OPENSSL_NO_CHACHA
 static int test_bio_enc_chacha20(int idx)
 {
     return do_test_bio_cipher(EVP_chacha20(), idx);
 }
 
+#  ifndef OPENSSL_NO_POLY1305
 static int test_bio_enc_chacha20_poly1305(int idx)
 {
     return do_test_bio_cipher(EVP_chacha20_poly1305(), idx);
 }
+#  endif
+# endif
 
 int setup_tests(void)
 {