chore: Update libs, reorder files, internalize private headers

9 files changed, 222 insertions, 11 deletions

diff --git a/src/crypto/hkdf.c b/src/hkdf.c
index 0d91d14..0d91d14 100644
--- a/src/crypto/hkdf.c
+++ b/src/hkdf.c
diff --git a/src/hkdf.h b/src/hkdf.h
new file mode 100644
index 0000000..460e203
--- /dev/null
+++ b/src/hkdf.h
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2024 Vaughn Nugent
+*
+* Package: noscrypt
+* File: hkdf.h
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation; either version 2.1
+* of the License, or  (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with noscrypt. If not, see http://www.gnu.org/licenses/.
+*/
+
+#pragma once
+
+#ifndef _NC_HKDF_H
+#define _NC_HKDF_H
+
+#include "nc-util.h"
+#include "nc-crypto.h"
+
+/*
+* IMPORTANT:
+*	The HKDF_IN_BUF_SIZE defintion sets the internal stack buffer size to use
+*	during fallback HKDF_Expand operations.
+*
+*	128 bytes should be more than enough for most use cases, without going 
+*	overboard. Could be dialed in better for specific use cases later.
+*/
+
+#ifndef HKDF_IN_BUF_SIZE
+	#define HKDF_IN_BUF_SIZE	0x80	
+#endif
+
+
+/* typedefs for hdkf callback functions */
+
+typedef cstatus_t (*hmac_hash_func)(void* ctx, const cspan_t* data);
+typedef cstatus_t (*hmac_finish_fn)(void* ctx, sha256_t hmacOut32);
+
+struct nc_hkdf_fn_cb_struct
+{
+	hmac_hash_func update;
+	hmac_finish_fn finish;
+};
+
+cstatus_t hkdfExpandProcess(
+	const struct nc_hkdf_fn_cb_struct* handler,
+	void* ctx,
+	const cspan_t* info,
+	span_t* okm
+);
+
+#endif /* !_NC_HKDF_H */
diff --git a/src/crypto/nc-crypto.c b/src/nc-crypto.c
index 587d59d..97b59cb 100644
--- a/src/crypto/nc-crypto.c
+++ b/src/nc-crypto.c
@@ -20,6 +20,7 @@
 
 #include "nc-util.h"
 #include "nc-crypto.h"
+#include "hkdf.h"
 
 /*
 *  Functions are not forced inline, just suggested.
@@ -52,19 +53,19 @@
 /*
 * Prioritize embedded builds with mbedtls
 */
-#include "impl/mbedtls.c"
+#include "providers/mbedtls.c"
 
 /*
 * Include openssl as an alternative default 
 * implementation
 */
-#include "impl/openssl.c"
+#include "providers/openssl.c"
 
 /*
 * Include win32 platform specific fallback support 
 * using bcrypt.
 */
-#include "impl/bcrypt.c"
+#include "providers/bcrypt.c"
 
 /*
 * Handle default implementations of secure 
@@ -95,7 +96,7 @@
 * and portable, but not optimized for any specific
 * platform.
 */
-#include "impl/monocypher.c"
+#include "providers/monocypher.c"
 
 
 #ifdef _IMPL_CRYPTO_SHA256_HMAC
diff --git a/src/nc-crypto.h b/src/nc-crypto.h
new file mode 100644
index 0000000..f04ebe0
--- /dev/null
+++ b/src/nc-crypto.h
@@ -0,0 +1,59 @@
+
+/*
+* Copyright (c) 2024 Vaughn Nugent
+*
+* Package: noscrypt
+* File: nc-crypto.h
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation; either version 2.1
+* of the License, or  (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with noscrypt. If not, see http://www.gnu.org/licenses/.
+*/
+
+#pragma once
+
+#ifndef _NC_CRYPTO_H
+#define _NC_CRYPTO_H
+
+#include <stdint.h>
+
+#define CHACHA_NONCE_SIZE		0x0cu		/* Size of 12 is set by the cipher spec */
+#define CHACHA_KEY_SIZE			0x20u		/* Size of 32 is set by the cipher spec */
+#define SHA256_DIGEST_SIZE		0x20u		/* Size of 32 is set by the cipher spec */
+
+typedef uint8_t cstatus_t;
+#define CSTATUS_OK				((cstatus_t)0x01u)
+#define CSTATUS_FAIL			((cstatus_t)0x00u)
+
+typedef uint8_t sha256_t[SHA256_DIGEST_SIZE];
+
+uint32_t ncCryptoFixedTimeComp(const uint8_t* a, const uint8_t* b, uint32_t size);
+
+void ncCryptoSecureZero(void* ptr, uint32_t size);
+
+cstatus_t ncCryptoDigestSha256(const cspan_t* data, sha256_t digestOut32);
+
+cstatus_t ncCryptoHmacSha256(const cspan_t* key, const cspan_t* data, sha256_t hmacOut32);
+
+cstatus_t ncCryptoSha256HkdfExpand(const cspan_t* prk, const cspan_t* info, span_t* okm);
+
+cstatus_t ncCryptoSha256HkdfExtract(const cspan_t* salt, const cspan_t* ikm, sha256_t prk);
+
+cstatus_t ncCryptoChacha20(
+	const uint8_t key[CHACHA_KEY_SIZE],
+	const uint8_t nonce[CHACHA_NONCE_SIZE],
+	const uint8_t* input,
+	uint8_t* output,
+	uint32_t dataSize
+);
+
+#endif /* !_NC_CRYPTO_H */
diff --git a/src/nc-util.h b/src/nc-util.h
new file mode 100644
index 0000000..8fb74ff
--- /dev/null
+++ b/src/nc-util.h
@@ -0,0 +1,95 @@
+
+/*
+* Copyright (c) 2024 Vaughn Nugent
+*
+* Package: noscrypt
+* File: nc-util.h
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation; either version 2.1
+* of the License, or  (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with noscrypt. If not, see http://www.gnu.org/licenses/.
+*/
+
+#pragma once
+
+#ifndef _NC_UTIL_H
+#define _NC_UTIL_H
+
+#include "platform.h"
+
+/* NULL */
+#ifndef NULL
+	#define NULL ((void*)0)
+#endif /*  !NULL */
+
+#ifdef DEBUG
+	/* Must include assert.h for assertions */
+	#include <assert.h> 
+	#define DEBUG_ASSERT(x) assert(x);
+	#define DEBUG_ASSERT2(x, message) assert(x && message);	
+
+	/*
+	* Compiler enabled static assertion keywords are 
+	* only available in C11 and later. Later versions 
+	* have macros built-in from assert.h so we can use
+	* the static_assert macro directly.
+	* 
+	* Static assertions are only used for testing such as 
+	* sanity checks and this library targets the c89 standard
+	* so static_assret very likely will not be available. 
+	*/
+	#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+		#define STATIC_ASSERT(x, m) static_assert(x, m)
+	#elif !defined(STATIC_ASSERT)
+		#define STATIC_ASSERT(x, m)
+		#pragma message("Static assertions are not supported by this language version")
+	#endif
+
+#else
+	#define DEBUG_ASSERT(x)
+	#define DEBUG_ASSERT2(x, message)
+	#define STATIC_ASSERT(x, m)
+#endif
+
+#include <stdint.h>
+
+#if SIZE_MAX < UINT32_MAX
+	#define _overflow_check(x) if(x > SIZE_MAX) return CSTATUS_FAIL;
+#else
+	#define _overflow_check(x)
+#endif
+
+typedef struct memory_span_struct
+{
+	uint8_t* data;
+	uint32_t size;
+} span_t;
+
+typedef struct read_only_memory_span_struct
+{
+	const uint8_t* data;
+	uint32_t size;
+} cspan_t;
+
+static _nc_fn_inline void ncSpanInitC(cspan_t* span, const uint8_t* data, uint32_t size)
+{
+	span->data = data;
+	span->size = size;
+}
+
+static _nc_fn_inline void ncSpanInit(span_t* span, uint8_t* data, uint32_t size)
+{
+	span->data = data;
+	span->size = size;
+}
+
+#endif /* !_NC_UTIL_H */
\ No newline at end of file
diff --git a/src/crypto/impl/bcrypt.c b/src/providers/bcrypt.c
index 9b01cac..d1b9aa5 100644
--- a/src/crypto/impl/bcrypt.c
+++ b/src/providers/bcrypt.c
@@ -31,9 +31,6 @@
 #include <Windows.h>
 #include <bcrypt.h>
 
-#include "nc-util.h"
-#include "hkdf.h"
-
 #define IF_BC_FAIL(x) if(!BCRYPT_SUCCESS(x)) 
 #define BC_FAIL(x) if(!BCRYPT_SUCCESS(x)) return CSTATUS_FAIL;
 
diff --git a/src/crypto/impl/mbedtls.c b/src/providers/mbedtls.c
index df5201f..df5201f 100644
--- a/src/crypto/impl/mbedtls.c
+++ b/src/providers/mbedtls.c
diff --git a/src/crypto/impl/monocypher.c b/src/providers/monocypher.c
index 7c9faea..8ffe048 100644
--- a/src/crypto/impl/monocypher.c
+++ b/src/providers/monocypher.c
@@ -31,8 +31,6 @@
 
 #include <monocypher.h>
 
-#include "nc-util.h"
-
 /* Export secure memse0 */
 #ifndef _IMPL_SECURE_ZERO_MEMSET
 
diff --git a/src/crypto/impl/openssl.c b/src/providers/openssl.c
index 132c643..1f31796 100644
--- a/src/crypto/impl/openssl.c
+++ b/src/providers/openssl.c
@@ -22,7 +22,6 @@
 /* Setup openssl */
 #ifdef OPENSSL_CRYPTO_LIB
 
-#include "nc-util.h"
 #include <openssl/crypto.h>
 
 #define _OSSL_FAIL(x) if(!(x)) return CSTATUS_FAIL;
@@ -114,7 +113,6 @@
 #ifndef _IMPL_CRYPTO_SHA256_HKDF_EXPAND
 	
 	#include <openssl/hmac.h>
-	#include "hkdf.h"
 
 	#define _IMPL_CRYPTO_SHA256_HKDF_EXPAND		_ossl_sha256_hkdf_expand
 
@@ -189,6 +187,8 @@
 
 #ifndef _IMPL_CHACHA20_CRYPT
 
+    #include <openssl/evp.h>
+
 	#define _IMPL_CHACHA20_CRYPT _ossl_chacha20_crypt
 
 	_IMPLSTB cstatus_t _ossl_chacha20_crypt(