From 20df771af78753cf591957909bc4805847aee482 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Tue, 13 Jun 2023 21:36:07 +0100
Subject: [PATCH] iwym: cc20.h

---
 include/cc20.h       | 8 +++-----
 include/n2n.h        | 1 -
 src/cc20.c           | 8 ++++++++
 src/transform_cc20.c | 1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/cc20.h b/include/cc20.h
index 3a5b553..51f4425 100644
--- a/include/cc20.h
+++ b/include/cc20.h
@@ -21,9 +21,9 @@
 #define CC20_H
 
 
-#include <stdint.h>
-
-#include "n2n.h"               // HAVE_OPENSSL_1_1, traceEvent ...
+#include <stddef.h>  // for size_t
+#include <stdint.h>  // for uint32_t, uint8_t
+#include "config.h"  // HAVE_OPENSSL_1_1
 
 
 #define CC20_IV_SIZE           16
@@ -46,8 +46,6 @@ typedef struct cc20_context_t {
 #elif defined (__SSE2__)  // SSE2 ---------------------------------------------------------------------------------
 
 
-#include <immintrin.h>
-
 typedef struct cc20_context {
     uint32_t keystream32[16];
     uint8_t key[CC20_KEY_BYTES];
diff --git a/include/n2n.h b/include/n2n.h
index 0d0f860..61b8db0 100644
--- a/include/n2n.h
+++ b/include/n2n.h
@@ -143,7 +143,6 @@
 #include "pearson.h"
 #include "portable_endian.h"
 #include "aes.h"
-#include "cc20.h"
 #include "speck.h"
 #include "curve25519.h"
 #include "n2n_regex.h"
diff --git a/src/cc20.c b/src/cc20.c
index 73fab8c..6a4ae1f 100644
--- a/src/cc20.c
+++ b/src/cc20.c
@@ -17,7 +17,11 @@
  */
 
 
+#include <stdlib.h>     // for calloc, free, size_t
+#include <string.h>     // for memcpy
 #include "cc20.h"
+#include "config.h"  // HAVE_OPENSSL_1_1
+#include "portable_endian.h"  // for htole32
 
 
 #if defined (HAVE_OPENSSL_1_1) // openSSL 1.1 ---------------------------------------------------------------------
@@ -84,6 +88,10 @@ int cc20_crypt (unsigned char *out, const unsigned char *in, size_t in_len,
 // https://github.com/Ginurx/chacha20-c (public domain)
 
 
+#include <immintrin.h>  // for _mm_xor_si128, _mm_add_epi32, _mm_slli_epi32
+#include <xmmintrin.h>  // for _MM_SHUFFLE
+
+
 #define SL  _mm_slli_epi32
 #define SR  _mm_srli_epi32
 #define XOR _mm_xor_si128
diff --git a/src/transform_cc20.c b/src/transform_cc20.c
index fe6eb8b..05061a6 100644
--- a/src/transform_cc20.c
+++ b/src/transform_cc20.c
@@ -17,6 +17,7 @@
  */
 
 
+#include "cc20.h"            // for CC20_IV_SIZE, cc20_crypt, cc20_deinit
 #include "n2n.h"