summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/crypto
diff options
context:
space:
mode:
authorjsing <>2014-05-15 15:09:01 +0000
committerjsing <>2014-05-15 15:09:01 +0000
commitfec12ac838b5428d9c1c0d074de2cfcfc2d60f6a (patch)
treef62e7b6e526d711ca1c6f1289ac45a6f4150d921 /src/lib/libcrypto/crypto
parentb115738274236129c97a787d577da5cbff4c828e (diff)
downloadopenbsd-fec12ac838b5428d9c1c0d074de2cfcfc2d60f6a.tar.gz
openbsd-fec12ac838b5428d9c1c0d074de2cfcfc2d60f6a.tar.bz2
openbsd-fec12ac838b5428d9c1c0d074de2cfcfc2d60f6a.zip
Add a ChaCha20-Poly1305 AEAD EVP implementation to libcrypto, from Adam
Langley's Chromium OpenSSL patches. ok miod@
Diffstat (limited to 'src/lib/libcrypto/crypto')
-rw-r--r--src/lib/libcrypto/crypto/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index 7e1f497223..78261e6ef6 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.34 2014/05/15 13:53:46 jsing Exp $ 1# $OpenBSD: Makefile,v 1.35 2014/05/15 15:09:01 jsing Exp $
2 2
3LIB= crypto 3LIB= crypto
4 4
@@ -152,7 +152,7 @@ SRCS+= c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c
152SRCS+= evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c 152SRCS+= evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c
153SRCS+= e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c 153SRCS+= e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c
154SRCS+= e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c 154SRCS+= e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c
155SRCS+= e_chacha.c evp_aead.c 155SRCS+= e_chacha.c evp_aead.c e_chacha20poly1305.c
156 156
157# hmac/ 157# hmac/
158SRCS+= hmac.c hm_ameth.c hm_pmeth.c 158SRCS+= hmac.c hm_ameth.c hm_pmeth.c