diff options
| author | Bill Cox <waywardgeek@google.com> | 2016-03-09 23:08:31 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-11 10:39:10 -0500 |
| commit | 2d0b44126763f989a4cbffbffe9d0c7518158bb7 (patch) | |
| tree | 241855d2b5a9b91688f969bf849037f6a0343594 /apps | |
| parent | 40f43f8a2e7c75f032672d198604e4fbd6a60fd8 (diff) | |
Add blake2 support.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/openssl.c | 3 | ||||
| -rw-r--r-- | apps/progs.h | 6 | ||||
| -rw-r--r-- | apps/progs.pl | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index e0694fc3b4..d460a6b886 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -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 diff --git a/apps/progs.h b/apps/progs.h index 266e48dc78..77b4555cd5 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -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 diff --git a/apps/progs.pl b/apps/progs.pl index b87aef610e..f24b91bde8 100644 --- a/apps/progs.pl +++ b/apps/progs.pl @@ -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"; |