summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-10-25 00:17:45 +0200
committerRichard Levitte <levitte@openssl.org>2018-10-30 08:09:07 +0100
commitc89d9cdab1727553e3cfa964e9f082cbc5a194c2 (patch)
tree5b26c9223e983f0ef1624d166b77759081af8b71 /crypto/evp
parentrand_drbg.h: include <openssl/obj_mac.h> (diff)
downloadopenssl-c89d9cdab1727553e3cfa964e9f082cbc5a194c2.tar.xz
openssl-c89d9cdab1727553e3cfa964e9f082cbc5a194c2.zip
EVP_MAC: Add SipHash implementation
Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/7494)
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/c_allm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/evp/c_allm.c b/crypto/evp/c_allm.c
index edf8ba500b..2bcd9dc9b5 100644
--- a/crypto/evp/c_allm.c
+++ b/crypto/evp/c_allm.c
@@ -16,4 +16,7 @@ void openssl_add_all_macs_int(void)
EVP_add_mac(&cmac_meth);
#endif
EVP_add_mac(&hmac_meth);
+#ifndef OPENSSL_NO_SIPHASH
+ EVP_add_mac(&siphash_meth);
+#endif
}