Squashed commit of the following:v0.1.2

commit 1c26ef86a04690120f4f752c7c5018a570ec5880
Author: vnugent <public@vaughnnugent.com>
Date:   Wed May 29 13:34:20 2024 -0400

    missed extra argument

commit 88c9095743a12cf8fc1793c607ba3a1e4fa86483
Author: vnugent <public@vaughnnugent.com>
Date:   Wed May 29 13:25:51 2024 -0400

    refactor!: return NC_SUCCESS when validating secret key

commit 718be80a4810b9352de7eb0707da54020aa6b649
Author: vnugent <public@vaughnnugent.com>
Date:   Mon May 27 14:52:41 2024 -0400

    fix: Properly build mbedtls & cmake fixes

commit a8a6efb2319f739e5faae550561dc27d9dd1e88d
Author: vnugent <public@vaughnnugent.com>
Date:   Sun May 26 17:39:40 2024 -0400

    chore: Update libs, reorder files, internalize private headers

commit 72e1b7be4031e2fd4d258fcf434ad049c0029201
Author: vnugent <public@vaughnnugent.com>
Date:   Sun May 26 13:39:08 2024 -0400

    fix: Add c++ extern prototypes in noscrypt.h

commit aeaac8d328b75911541be64d6f09d58fca294a08
Author: vnugent <public@vaughnnugent.com>
Date:   Sun May 26 11:47:17 2024 -0400

    refactor: Dep update, openssl chacha20 added

commit 86b02540cce6015cfe4a2a56499a9a2f45d4e368
Author: vnugent <public@vaughnnugent.com>
Date:   Sat May 18 12:24:17 2024 -0400

    refactor: Remove NCContext structure definition

commit d09d9330415d463ca19be9394b02ce11b3366f7e
Author: vnugent <public@vaughnnugent.com>
Date:   Mon May 13 22:33:50 2024 -0400

    fix: update mbedtls inline issue includes

commit 7838cb4bb15d4f453f92f56ece75e2b03986fe42
Author: vnugent <public@vaughnnugent.com>
Date:   Mon May 13 22:29:16 2024 -0400

    fix: force fPIC for secp256k1 targets

commit d76f7708bc6ae81a638ca708230ac9153ac754e2
Merge: aa8033d a526139
Author: vnugent <public@vaughnnugent.com>
Date:   Sun May 12 00:37:01 2024 -0400

    Merge branch 'master' into develop

commit aa8033d4dbfebeb72b6fd7a0cd218ebde0eb54dd
Author: vnugent <public@vaughnnugent.com>
Date:   Sun May 12 00:34:20 2024 -0400

    Final overview and test before tag

commit 4e3ead2cf1d3068e77f0959dfdc17e20e9102a0f
Merge: 2cee801 872c49d
Author: vnugent <public@vaughnnugent.com>
Date:   Mon May 6 22:08:09 2024 -0400

    Merge branch 'master' into develop

commit 2cee801979bfbcb3b0e53f592ce8c779b57cb679
Author: vnugent <public@vaughnnugent.com>
Date:   Mon May 6 22:02:39 2024 -0400

    Ensure static and dynamic libs get same args

commit f533694023133552d0d42933d779c95a5854343f
Author: vnugent <public@vaughnnugent.com>
Date:   Mon May 6 21:50:29 2024 -0400

    feat: CMake install & fetch-content test & updates

commit 940ff20348b13d0bc30d9e9f4289dd6de20b16ba
Author: vnugent <public@vaughnnugent.com>
Date:   Sun May 5 14:07:28 2024 -0400

    codeberg readonly push

commit b34ed055c0b7d143561ce8798e0a95313b9224bd
Merge: 0a40e20 e737556
Author: vnugent <public@vaughnnugent.com>
Date:   Sat May 4 14:06:45 2024 -0400

    Merge branch 'master' into develop

commit 0a40e209d03e8ff9b6f81cd5969d3e845c633bfc
Author: vnugent <public@vaughnnugent.com>
Date:   Sat May 4 13:55:19 2024 -0400

    ci: Force disable testing for win ci builds

commit 55fae189fffc86f07a3448370f0a746670819712
Author: vnugent <public@vaughnnugent.com>
Date:   Thu May 2 21:54:35 2024 -0400

    feat: Working and tested openssl impl & defaults

commit 6ff8bb11774c51fd341b7699a3938fd894995fbf
Author: vnugent <public@vaughnnugent.com>
Date:   Thu Apr 25 17:45:42 2024 -0400

    refactor: Finish support and testing for mbedtls

commit 7cb7a93de4f6f5e741bc5129e3d928e44f050930
Author: vnugent <public@vaughnnugent.com>
Date:   Tue Apr 23 18:19:31 2024 -0400

    refactor!: MbedTLS on Windows, switch to uint32

commit 30e8dda6cbea86bdee6d5dfe48514385d3b9f81b
Author: vnugent <public@vaughnnugent.com>
Date:   Tue Apr 23 14:48:05 2024 -0400

    refactor: Crypto dep redesign working on Windows

commit d09c6c1bd5da3e2d79351daeba304ca99976a726
Author: vnugent <public@vaughnnugent.com>
Date:   Thu Apr 18 00:28:51 2024 -0400

    refactor!: Pushing what I have to dev

commit 54e06ada7d624ed0d28c6a6db04a149708841bf8
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Apr 13 01:24:00 2024 -0400

    fix: convert constants to hex, inline macro, ParseErrorCode

commit 4215e3100d9a0d23119080d09638fa5b60d0c6d4
Merge: d3328f4 7485aa5
Author: vnugent <public@vaughnnugent.com>
Date:   Wed Apr 3 18:26:30 2024 -0400

    Merge branch 'master' into develop

commit d3328f4152b22b28f24c43dda62464287f1efff5
Author: vnugent <public@vaughnnugent.com>
Date:   Wed Apr 3 18:22:56 2024 -0400

    build: Included dependency and versions in client builds

commit b11bc0bac955fd5c6db65f0da48456bf5e748805
Author: vnugent <public@vaughnnugent.com>
Date:   Wed Apr 3 18:10:08 2024 -0400

    fix: Fix c89 compatabilty comments and struct assignment

commit 9915bd41799a72413e6b400e150aa9f5fa797e25
Merge: 8e3d6ea 5184d7d
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Mar 30 09:57:30 2024 -0400

    Merge branch 'master' into develop

commit 8e3d6ea5e3c83fe42cb904b6ccc4fe2b73f76aae
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Mar 30 09:52:55 2024 -0400

    refactor!: Some api (struct) changes and updated tests

commit e88e8420520204e20802516f01d4488bb0b1d6ea
Merge: 490dfee 21f6c0a
Author: vnugent <public@vaughnnugent.com>
Date:   Sun Mar 3 15:02:34 2024 -0500

    Merge branch 'master' into develop

commit 490dfee4ef22479009627435c6ad728c3cbbab54
Author: vnugent <public@vaughnnugent.com>
Date:   Sun Mar 3 14:59:25 2024 -0500

    test: #3 tests for encryption/description and Macs

commit efa97490b7ed47f4e2f05bee52e2b33e14e439e6
Merge: 1b84e3c 120022a
Author: vnugent <public@vaughnnugent.com>
Date:   Sun Mar 3 14:55:48 2024 -0500

    merge master

commit 1b84e3c7c2e55b1ff9ffdd09b66873e11c131441
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Mar 2 22:57:36 2024 -0500

    fix: #2 constent usage of sizeof() operator on struct types

commit 9de5a214c66adea0ef2d0bac63c59449de202a88
Author: vnugent <public@vaughnnugent.com>
Date:   Fri Mar 1 14:30:36 2024 -0500

    perf: avoid nc_key struct copy, cast and verify instead

commit b917b761120ed684af28d0707673ffadcf14b8fe
Author: vnugent <public@vaughnnugent.com>
Date:   Mon Feb 12 22:06:50 2024 -0500

    fix: found the constant time memcompare function

commit 9f85fff3b9f25da7410569ea94f994b88feb3910
Author: vnugent <public@vaughnnugent.com>
Date:   Fri Feb 9 22:48:35 2024 -0500

    feat: added/update MAC functions to sign or verify nip44 payload

commit aa5113741bb419b02d6ea416bba571fa3d65db46
Author: vnugent <public@vaughnnugent.com>
Date:   Wed Feb 7 01:37:53 2024 -0500

    add missing hmac-key output buffer

commit 55f47d22cc9ce4d1e22b70814d608c7ef3b1bbc9
Author: vnugent <public@vaughnnugent.com>
Date:   Sun Feb 4 21:08:13 2024 -0500

    simple bug fixes, and public api argument validation tests

commit 73c5a713fb164ae8b4ac8a891a8020e08eae0a3b
Author: vnugent <public@vaughnnugent.com>
Date:   Fri Feb 2 23:05:48 2024 -0500

    update api to return secpvalidate return code instead of internal return codes

commit 06c73004e1a39a7ea4ea3a89c22dee0f66adb236
Author: vnugent <public@vaughnnugent.com>
Date:   Fri Feb 2 19:25:17 2024 -0500

    change to lgpl license

commit 6e79fdb3b6b6739fc7797d47e55a7691306cf736
Author: vnugent <public@vaughnnugent.com>
Date:   Wed Jan 31 21:30:49 2024 -0500

    move validation macros, and optionally disable them

commit ac1e58837f1ba687939f78b5c03cadd346c10ddd
Author: vnugent <public@vaughnnugent.com>
Date:   Tue Jan 30 12:25:05 2024 -0500

    couple more tests, renable range checks, set flags for all projects

10 files changed, 321 insertions, 27 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..dd319c7
--- /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/noscrypt.c b/src/noscrypt.c
index fac3dfb..f1aabd4 100644
--- a/src/noscrypt.c
+++ b/src/noscrypt.c
@@ -21,6 +21,7 @@
 #include "noscrypt.h"
 
 #include "nc-util.h"
+#include "hkdf.h"
 #include "nc-crypto.h"
 
 #include <secp256k1/secp256k1_ecdh.h>
@@ -52,11 +53,24 @@
 #endif /* !NC_DISABLE_INPUT_VALIDATION */
 
 /*
+* Actual, private defintion of the NCContext structure 
+* to allow for future development and ABI backords 
+* compatability.
+*/
+struct nc_ctx_struct {
+
+	void* secpCtx;
+
+};
+
+/*
 * The Nip44 constant salt
 * https://github.com/nostr-protocol/nips/blob/master/44.md#encryption
 */
 static const uint8_t Nip44ConstantSalt[8] = { 0x6e, 0x69, 0x70, 0x34, 0x34, 0x2d, 0x76, 0x32 };
 
+static struct nc_ctx_struct _ncSharedCtx;
+
 struct shared_secret {
 	uint8_t value[NC_SHARED_SEC_SIZE];
 };
@@ -90,13 +104,17 @@ STATIC_ASSERT(sizeof(struct nc_expand_keys) == sizeof(struct message_key), "Expe
 * Check that the fallback hkdf extract internal buffer is large enough
 * for full converstation key buffers 
 */
-STATIC_ASSERT(HKDF_IN_BUF_SIZE >= NC_CONV_KEY_SIZE + 8, "HKDF Buffer size is too small for Safe HKDF operations")
+STATIC_ASSERT(HKDF_IN_BUF_SIZE >= NC_CONV_KEY_SIZE + 8, "HKDF Buffer size is too small for safe HKDF operations")
 
 /*
 * Internal helper functions to do common structure conversions
 */
 
-static _nc_fn_inline int _convertToXonly(const NCContext* ctx, const NCPublicKey* compressedPubKey, secp256k1_xonly_pubkey* xonly)
+static _nc_fn_inline int _convertToXonly(
+	const NCContext* ctx, 
+	const NCPublicKey* compressedPubKey, 
+	secp256k1_xonly_pubkey* xonly
+)
 {
 	DEBUG_ASSERT2(ctx != NULL, "Expected valid context")
 	DEBUG_ASSERT2(compressedPubKey != NULL, "Expected a valid public 32byte key structure")
@@ -429,6 +447,12 @@ NC_EXPORT uint32_t NC_CC NCGetContextStructSize(void)
 	return sizeof(NCContext);
 }
 
+NC_EXPORT NCContext* NC_CC NCGetSharedContext(void)
+{
+	/*Return the global address of the shared context structure */
+	return &_ncSharedCtx;
+}
+
 NC_EXPORT NCResult NC_CC NCInitContext(
 	NCContext* ctx, 
 	const uint8_t entropy[NC_CONTEXT_ENTROPY_SIZE]
@@ -437,6 +461,8 @@ NC_EXPORT NCResult NC_CC NCInitContext(
 	CHECK_NULL_ARG(ctx, 0)
 	CHECK_NULL_ARG(entropy, 1)
 
+	ZERO_FILL(ctx, sizeof(NCContext));
+
 	ctx->secpCtx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
 
 	/* 
@@ -516,7 +542,9 @@ NC_EXPORT NCResult NC_CC NCValidateSecretKey(const NCContext* ctx, const NCSecre
 	CHECK_CONTEXT_STATE(ctx, 0)
 
 	/* Validate the secret key */
-	return secp256k1_ec_seckey_verify(ctx->secpCtx, sk->key);
+	return secp256k1_ec_seckey_verify(ctx->secpCtx, sk->key) == 1 
+		? NC_SUCCESS 
+		: E_OPERATION_FAILED;
 }
 
 /* Ecdsa Functions */
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 057e7b4..df5201f 100644
--- a/src/crypto/impl/mbedtls.c
+++ b/src/providers/mbedtls.c
@@ -31,20 +31,22 @@
 /* Inline errors on linux in header files on linux */
 #ifndef inline
 	#define inline __inline
-#endif
-
-#include <mbedtls/md.h>
-#include <mbedtls/hkdf.h>
-#include <mbedtls/hmac_drbg.h>
-#include <mbedtls/sha256.h>
-#include <mbedtls/chacha20.h>
-#include <mbedtls/constant_time.h>
-
-#ifndef inline
+	#include <mbedtls/md.h>
+	#include <mbedtls/hkdf.h>
+	#include <mbedtls/hmac_drbg.h>
+	#include <mbedtls/sha256.h>
+	#include <mbedtls/chacha20.h>
+	#include <mbedtls/constant_time.h>
 	#undef inline
+#else
+	#include <mbedtls/md.h>
+	#include <mbedtls/hkdf.h>
+	#include <mbedtls/hmac_drbg.h>
+	#include <mbedtls/sha256.h>
+	#include <mbedtls/chacha20.h>
+	#include <mbedtls/constant_time.h>
 #endif
 
-
 _IMPLSTB const mbedtls_md_info_t* _mbed_sha256_alg(void)
 {
 	const mbedtls_md_info_t* info;
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 fd3b4e6..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
 
@@ -150,6 +148,8 @@
 		EVP_MD_CTX* ctx;
 		cstatus_t result;
 		struct nc_hkdf_fn_cb_struct handler;
+
+		result = CSTATUS_FAIL;
 	
 		/*
 		* NOTE! Hmac reusable flag must be set to allow for multiple
@@ -161,15 +161,23 @@
 			return CSTATUS_FAIL;
 		}
 
-		_OSSL_FAIL(EVP_DigestInit_ex2(ctx, EVP_sha256(), NULL))
+		if (!EVP_DigestInit_ex2(ctx, EVP_sha256(), NULL))
+		{
+			goto Cleanup;
+		}
 
-		_OSSL_FAIL(EVP_DigestUpdate(ctx, prk->data, prk->size));
+		if (!EVP_DigestUpdate(ctx, prk->data, prk->size)) 
+		{
+			goto Cleanup;
+		}
 		
 		handler.update = _ossl_hkdf_update;
 		handler.finish = _ossl_hkdf_finish;
 
 		result = hkdfExpandProcess(&handler, ctx, info, okm);
 
+	Cleanup:
+
 		EVP_MD_CTX_destroy(ctx);
 
 		return result;
@@ -177,4 +185,49 @@
 
 #endif /* !_IMPL_CRYPTO_SHA256_HKDF_EXPAND */
 
+#ifndef _IMPL_CHACHA20_CRYPT
+
+    #include <openssl/evp.h>
+
+	#define _IMPL_CHACHA20_CRYPT _ossl_chacha20_crypt
+
+	_IMPLSTB cstatus_t _ossl_chacha20_crypt(
+		const uint8_t* key,
+		const uint8_t* nonce,
+		const uint8_t* input,
+		uint8_t* output,
+		uint32_t dataLen
+	)
+	{
+		cstatus_t result;
+		EVP_CIPHER_CTX* ctx;
+
+		result = CSTATUS_FAIL;
+
+		if ((ctx = EVP_CIPHER_CTX_new()) == NULL)
+		{
+			return CSTATUS_FAIL;
+		}
+
+		if (!EVP_EncryptInit_ex(ctx, EVP_chacha20(), NULL, key, nonce))
+		{
+			goto Cleanup;
+		}
+
+		if (!EVP_EncryptUpdate(ctx, output, (int*)&dataLen, input, dataLen))
+		{
+			goto Cleanup;
+		}
+
+		result = CSTATUS_OK;
+
+	Cleanup:
+
+		EVP_CIPHER_CTX_free(ctx);
+
+		return result;
+	}
+
+#endif
+
 #endif	/*!OPENSSL_CRYPTO_LIB */
\ No newline at end of file