From f05c24b259a964e637173bbda061e02568b6c273 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Wed, 28 Jun 2023 23:55:43 +0100
Subject: [PATCH] Fix openssl support and add it to tests

---
 .github/workflows/tests.yml | 1 +
 src/aes.c                   | 3 +++
 src/cc20.c                  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 574f6ef..d81713c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -62,6 +62,7 @@ jobs:
             --enable-natpmp \
             --enable-cap \
             --enable-pcap \
+            --with-openssl \
             --with-zstd \
             CFLAGS="-O3"
           make test
diff --git a/src/aes.c b/src/aes.c
index 2d4ec03..8469f4f 100644
--- a/src/aes.c
+++ b/src/aes.c
@@ -16,6 +16,7 @@
  *
  */
 
+#include "config.h"
 
 #include <stdint.h>  // for uint32_t, uint8_t
 #include <stdlib.h>  // for calloc, free
@@ -27,6 +28,8 @@
 
 #if defined (HAVE_OPENSSL_1_1) // openSSL 1.1 ---------------------------------------------------------------------
 
+#include <openssl/err.h>    // for ERR_print_errors
+#include <openssl/evp.h>    // for EVP_EncryptInit_ex, EVP_CIPHER_CTX_set_p...
 
 // get any erorr message out of openssl
 // taken from https://en.wikibooks.org/wiki/OpenSSL/Error_handling
diff --git a/src/cc20.c b/src/cc20.c
index 6a4ae1f..09c4844 100644
--- a/src/cc20.c
+++ b/src/cc20.c
@@ -21,6 +21,7 @@
 #include <string.h>     // for memcpy
 #include "cc20.h"
 #include "config.h"  // HAVE_OPENSSL_1_1
+#include "n2n.h"     // for TRACE_ERROR, traceEvent
 #include "portable_endian.h"  // for htole32