[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  642befa16e42feadd4d8d843a6d563ae4d161171 (commit)
       via  0a0365256c097fe2ec91c3d1111495d2444cf36d (commit)
      from  bf8bdbc678caacf5f91b7e669422862c2d0583c9 (commit)


- Log -----------------------------------------------------------------
commit 642befa16e42feadd4d8d843a6d563ae4d161171
Author: Mat <mberchtold at gmail.com>
Date:   Fri Mar 11 20:20:20 2016 +0100

    removed extra define
    
    verified that build succeeds without the extra define
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0a0365256c097fe2ec91c3d1111495d2444cf36d
Author: Mat <mberchtold at gmail.com>
Date:   Fri Mar 11 18:26:57 2016 +0100

    Fix no-blake2 for Windows classic build
    
    Fix no-blake2 for Windows classic build
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 util/mk1mf.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 209113f..ac0cb99 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -135,6 +135,7 @@ foreach (@ARGV)
 and [options] can be one of
 	no-md2 no-md4 no-md5 no-sha no-mdc2	- Skip this digest
 	no-rmd160
+	no-blake2				- No blake2
 	no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
 	no-bf no-cast no-aes no-camellia no-seed
 	no-rsa no-dsa no-dh			- Skip this public key cipher
@@ -1073,6 +1074,7 @@ sub var_add
 	@a=grep(!/(^md4)|(_md4$)/, at a) if $no_md4;
 	@a=grep(!/(^md5)|(_md5$)/, at a) if $no_md5;
 	@a=grep(!/(rmd)|(ripemd)/, at a) if $no_ripemd;
+	@a=grep(!/(^blake)/, at a) if $no_blake2;
 
 	@a=grep(!/(^d2i_r_)|(^i2d_r_)/, at a) if $no_rsa;
 	@a=grep(!/(^p_open$)/, at a) if $no_rsa;
@@ -1378,6 +1380,7 @@ sub read_options
 		"no-md4" => \$no_md4,
 		"no-md5" => \$no_md5,
 		"no-rmd160" => \$no_ripemd,
+		"no-blake2" => \$no_blake2,		
 		"no-mdc2" => \$no_mdc2,
 		"no-whirlpool" => \$no_whirlpool,
 		"no-patents" =>