summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorBill Cox <waywardgeek@google.com>2016-03-09 23:08:31 +0100
committerRich Salz <rsalz@openssl.org>2016-03-11 10:39:10 -0500
commit2d0b44126763f989a4cbffbffe9d0c7518158bb7 (patch)
tree241855d2b5a9b91688f969bf849037f6a0343594 /util
parent40f43f8a2e7c75f032672d198604e4fbd6a60fd8 (diff)
Add blake2 support.
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util')
-rw-r--r--util/libcrypto.num2
-rwxr-xr-xutil/mkdef.pl2
-rwxr-xr-xutil/mkfiles.pl1
3 files changed, 4 insertions, 1 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 7d893a1134..d23dbc44e9 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4057,3 +4057,5 @@ ECPKPARAMETERS_it 3923 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:
EC_GROUP_get_ecparameters 3924 1_1_0 EXIST::FUNCTION:EC
DHparams_it 3925 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DH
DHparams_it 3925 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DH
+EVP_blake2b 3926 1_1_0 EXIST::FUNCTION:BLAKE2
+EVP_blake2s 3927 1_1_0 EXIST::FUNCTION:BLAKE2
diff --git a/util/mkdef.pl b/util/mkdef.pl
index a847b0b077..4578c9afc2 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -75,7 +75,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"SHA256", "SHA512", "RMD160",
"MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "EC2M",
"HMAC", "AES", "CAMELLIA", "SEED", "GOST",
- "SCRYPT", "CHACHA", "POLY1305",
+ "SCRYPT", "CHACHA", "POLY1305", "BLAKE2",
# EC_NISTP_64_GCC_128
"EC_NISTP_64_GCC_128",
# Envelope "algorithms"
diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 1e5f84e049..0e4f71e04d 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -63,6 +63,7 @@ my @dirs = (
"crypto/async",
"crypto/chacha",
"crypto/poly1305",
+"crypto/blake2",
"crypto/kdf",
"ssl",
"apps",