[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  487d3a726a1970e84853434561d88cb4ac212d15 (commit)
      from  ef3f621ed572fefe768f26989c16264496d24f69 (commit)


- Log -----------------------------------------------------------------
commit 487d3a726a1970e84853434561d88cb4ac212d15
Author: EasySec <easy.sec at free.fr>
Date:   Tue Jan 17 17:21:55 2017 +0100

    Fix list -disabled for blake2 alg
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2241)

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

Summary of changes:
 apps/openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index f6a8f9d..7aa02b6 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -577,7 +577,7 @@ static void list_disabled(void)
 #ifdef OPENSSL_NO_BF
     BIO_puts(bio_out, "BF\n");
 #endif
-#ifndef OPENSSL_NO_BLAKE2
+#ifdef OPENSSL_NO_BLAKE2
     BIO_puts(bio_out, "BLAKE2\n");
 #endif
 #ifdef OPENSSL_NO_CAMELLIA