Provide EVP_chacha20_poly1305()

EVP_chacha20_poly1305() is an EVP_CIPHER implementation of the
ChaCha20-Poly1305 AEAD. This is potentially used to provide encryption for
the QUIC transport layer.

Where possible, this should be avoided in favour of the significantly saner
EVP_AEAD interface.

ok tb@

1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index f016b6377c..0b7fc08fc8 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp.h,v 1.103 2022/07/12 14:42:49 kn Exp $ */
+/* $OpenBSD: evp.h,v 1.104 2022/08/20 19:22:28 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -251,10 +251,11 @@ extern "C" {
 #define         EVP_CTRL_AEAD_SET_IVLEN         0x9
 #define         EVP_CTRL_AEAD_GET_TAG           0x10
 #define         EVP_CTRL_AEAD_SET_TAG           0x11
+#define         EVP_CTRL_AEAD_SET_IV_FIXED      0x12
 #define         EVP_CTRL_GCM_SET_IVLEN          EVP_CTRL_AEAD_SET_IVLEN
 #define         EVP_CTRL_GCM_GET_TAG            EVP_CTRL_AEAD_GET_TAG
 #define         EVP_CTRL_GCM_SET_TAG            EVP_CTRL_AEAD_SET_TAG
-#define         EVP_CTRL_GCM_SET_IV_FIXED       0x12
+#define         EVP_CTRL_GCM_SET_IV_FIXED       EVP_CTRL_AEAD_SET_IV_FIXED
 #define         EVP_CTRL_GCM_IV_GEN             0x13
 #define         EVP_CTRL_CCM_SET_IVLEN          EVP_CTRL_AEAD_SET_IVLEN
 #define         EVP_CTRL_CCM_GET_TAG            EVP_CTRL_AEAD_GET_TAG
@@ -680,6 +681,11 @@ const EVP_CIPHER *EVP_aes_256_ccm(void);
 const EVP_CIPHER *EVP_aes_256_gcm(void);
 const EVP_CIPHER *EVP_aes_256_wrap(void);
 const EVP_CIPHER *EVP_aes_256_xts(void);
+#if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+const EVP_CIPHER *EVP_chacha20_poly1305(void);
+#endif
+#endif
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
 const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);