aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcryptobox
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-10-25 22:45:51 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-10-25 22:45:51 +0000
commit13d9c7e4216f1da8c49f4fe9ec55111e49114645 (patch)
treef04436169d16e181911faee5dc520ab8512b451e /src/libcryptobox
parentc0a9cb5b58a7e6b9308fedc38a88a5c749700a10 (diff)
downloadrspamd-13d9c7e4216f1da8c49f4fe9ec55111e49114645.tar.gz
rspamd-13d9c7e4216f1da8c49f4fe9ec55111e49114645.zip
Remove previous blake2 implementation.
Diffstat (limited to 'src/libcryptobox')
-rw-r--r--src/libcryptobox/blake2/blake2.h2
-rw-r--r--src/libcryptobox/cryptobox.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libcryptobox/blake2/blake2.h b/src/libcryptobox/blake2/blake2.h
index abc0f1a9c..33a5e99c4 100644
--- a/src/libcryptobox/blake2/blake2.h
+++ b/src/libcryptobox/blake2/blake2.h
@@ -65,7 +65,7 @@ void blake2b_keyed (unsigned char *hash,
const unsigned char *key,
size_t keylen);
-int blake2b_startup (void);
+int blake2b_load (void);
#if defined(__cplusplus)
}
diff --git a/src/libcryptobox/cryptobox.c b/src/libcryptobox/cryptobox.c
index c3c0f3b35..051848e3d 100644
--- a/src/libcryptobox/cryptobox.c
+++ b/src/libcryptobox/cryptobox.c
@@ -33,9 +33,10 @@
#include "chacha20/chacha.h"
#include "poly1305/poly1305.h"
#include "curve25519/curve25519.h"
+#include "blake2/blake2.h"
#include "siphash/siphash.h"
#include "ottery.h"
-#include "blake2.h"
+
#ifdef HAVE_CPUID_H
#include <cpuid.h>
#endif
@@ -235,6 +236,7 @@ rspamd_cryptobox_init (void)
poly1305_load ();
siphash_load ();
curve25519_load ();
+ blake2b_load ();
}
void