[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0139ce7c92f5570ce1513cfe776df94460842ce0 (commit)
      from  1b3011abb36ff743c05afce1c9f2450d83d09d59 (commit)


- Log -----------------------------------------------------------------
commit 0139ce7c92f5570ce1513cfe776df94460842ce0
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Aug 25 11:02:47 2017 +0100

    Fix no-chacha and no-poly1305
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4251)

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

Summary of changes:
 test/bio_enc_test.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/bio_enc_test.c b/test/bio_enc_test.c
index 8474dc5..282e8da 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)
 {