Commit 2d0b4412 authored by Bill Cox's avatar Bill Cox Committed by Rich Salz
Browse files

Add blake2 support. 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 40f43f8a

Configure

+3 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ $config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "tools" ]; 
# crypto/ subdirectories to build

$config{sdirs} = [

    "objects",

    "md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305",

    "md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2",

    "des", "aes", "rc2", "rc4", "rc5", "idea", "bf", "cast", "camellia", "seed", "chacha", "modes",

    "bn", "ec", "rsa", "dsa", "dh", "dso", "engine",

    "buffer", "bio", "stack", "lhash", "rand", "err",
@@ -243,6 +243,7 @@ my @disablables = ( 
    "autoalginit",

    "autoerrinit",

    "bf",

    "blake2",

    "camellia",

    "capieng",

    "cast",
@@ -1787,6 +1788,7 @@ print "MODES_OBJ =$target{modes_obj}\n"; 
print "PADLOCK_OBJ   =$target{padlock_obj}\n";

print "CHACHA_ENC    =$target{chacha_obj}\n";

print "POLY1305_OBJ  =$target{poly1305_obj}\n";

print "BLAKE2_OBJ    =$target{blake2_obj}\n";

print "PROCESSOR     =$config{processor}\n";

print "RANLIB        =$target{ranlib}\n";

print "ARFLAGS       =$target{arflags}\n";

Makefile.in

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ RC5_ENC= {- $target{rc5_obj} -} 
MD5_ASM_OBJ= {- $target{md5_obj} -}

SHA1_ASM_OBJ= {- $target{sha1_obj} -}

RMD160_ASM_OBJ= {- $target{rmd160_obj} -}

BLAKE2_OBJ= {- $target{blake2_obj} -}

WP_ASM_OBJ= {- $target{wp_obj} -}

CMLL_ENC= {- $target{cmll_obj} -}

MODES_ASM_OBJ= {- $target{modes_obj} -}
@@ -281,6 +282,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ 
		SHA1_ASM_OBJ='$(SHA1_ASM_OBJ)'			\

		MD5_ASM_OBJ='$(MD5_ASM_OBJ)'			\

		RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'		\

		BLAKE2_OBJ='$(BLAKE2_OBJ)'                      \

		WP_ASM_OBJ='$(WP_ASM_OBJ)'			\

		MODES_ASM_OBJ='$(MODES_ASM_OBJ)'		\

		PADLOCK_ASM_OBJ='$(PADLOCK_ASM_OBJ)'		\

apps/openssl.c

+3 −0
Original line number Diff line number Diff line
@@ -650,6 +650,9 @@ static void list_disabled(void) 
#ifdef OPENSSL_NO_BF

    BIO_puts(bio_out, "BF\n");

#endif

#ifndef OPENSSL_NO_BLAKE2

    BIO_puts(bio_out, "BLAKE2\n");

#endif

#ifdef OPENSSL_NO_CAMELLIA

    BIO_puts(bio_out, "CAMELLIA\n");

#endif

apps/progs.h

+6 −0
Original line number Diff line number Diff line
@@ -225,6 +225,12 @@ static FUNCTION functions[] = { 
#ifndef OPENSSL_NO_RMD160

    { FT_md, "rmd160", dgst_main},

#endif

#ifndef OPENSSL_NO_BLAKE2B

    { FT_md, "blake2b", dgst_main},

#endif

#ifndef OPENSSL_NO_BLAKE2S

    { FT_md, "blake2s", dgst_main},

#endif

#ifndef OPENSSL_NO_AES

    { FT_cipher, "aes-128-cbc", enc_main, enc_options },

#endif

apps/progs.pl

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ foreach ( 
	"md2", "md4", "md5",

	"md_ghost94",

	"sha1", "sha224", "sha256", "sha384", "sha512",

	"mdc2", "rmd160"

	"mdc2", "rmd160", "blake2b", "blake2s"

) {

        printf "#ifndef OPENSSL_NO_".uc($_)."\n" if ! /sha/;

        printf "    { FT_md, \"".$_."\", dgst_main},\n";