From 17f16ac4fe890c2be0cf2ae1bcfbfd2e453794b5 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 20 Aug 2022 19:25:14 +0000
Subject: Test EVP_chacha20_poly1305() (linking statically for now)

---
 src/regress/lib/libcrypto/aead/Makefile   | 4 ++--
 src/regress/lib/libcrypto/aead/aeadtest.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/regress/lib/libcrypto/aead/Makefile b/src/regress/lib/libcrypto/aead/Makefile
index bf838aa941..961da9f8db 100644
--- a/src/regress/lib/libcrypto/aead/Makefile
+++ b/src/regress/lib/libcrypto/aead/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.7 2022/07/30 16:40:23 jsing Exp $
+#	$OpenBSD: Makefile,v 1.8 2022/08/20 19:25:14 jsing Exp $
 
 PROG=	aeadtest
-LDADD=	-lcrypto
+LDADD=	${CRYPTO_INT}
 DPADD=	${LIBCRYPTO}
 WARNINGS=	Yes
 CFLAGS+=	-DLIBRESSL_INTERNAL -Werror
diff --git a/src/regress/lib/libcrypto/aead/aeadtest.c b/src/regress/lib/libcrypto/aead/aeadtest.c
index 567b49a095..2c798a2918 100644
--- a/src/regress/lib/libcrypto/aead/aeadtest.c
+++ b/src/regress/lib/libcrypto/aead/aeadtest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aeadtest.c,v 1.22 2022/07/30 17:09:45 jsing Exp $	*/
+/*	$OpenBSD: aeadtest.c,v 1.23 2022/08/20 19:25:14 jsing Exp $	*/
 /*
  * Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2014, Google Inc.
@@ -101,6 +101,7 @@ aead_from_name(const EVP_AEAD **aead, const EVP_CIPHER **cipher,
 		*cipher = EVP_aes_256_gcm();
 	} else if (strcmp(name, "chacha20-poly1305") == 0) {
 		*aead = EVP_aead_chacha20_poly1305();
+		*cipher = EVP_chacha20_poly1305();
 	} else if (strcmp(name, "xchacha20-poly1305") == 0) {
 		*aead = EVP_aead_xchacha20_poly1305();
 	} else {
-- 
cgit v1.2.3-55-g6feb