1 files changed, 147 insertions, 15 deletions

diff --git a/src/crypto/impl/openssl.c b/src/crypto/impl/openssl.c
index 1217e60..90028e6 100644
--- a/src/crypto/impl/openssl.c
+++ b/src/crypto/impl/openssl.c
@@ -23,24 +23,156 @@
 
 #ifdef OPENSSL_CRYPTO_LIB
 
-#include <openssl/sha.h>
-
 #include "nc-util.h"
+#include <openssl/crypto.h>
 
-/*
-*		EXPORT SUPPORTED FUNCTIONS AS MACROS
-*/
-#define _IMPL_CHACHA20_CRYPT				_mbed_chacha20_encrypt			
-#define _IMPL_CRYPTO_SHA256_HMAC			_mbed_sha256_hmac
-#define _IMPL_CRYPTO_SHA256_DIGEST			_ossl_sha256_digest	
-#define _IMPL_CRYPTO_FIXED_TIME_COMPARE		_mbed_fixed_time_compare
-#define _IMPL_CRYPTO_SHA256_HKDF_EXPAND		_mbed_sha256_hkdf_expand
-#define _IMPL_CRYPTO_SHA256_HKDF_EXTRACT	_mbed_sha256_hkdf_extract
-
-_IMPLSTB int _ossl_sha256_digest(const uint8_t* data, uint8_t* digest)
-{
+#define _OSSL_FAIL(x) if(!(x)) return CSTATUS_FAIL;
+
+#ifndef _IMPL_SECURE_ZERO_MEMSET
+
+	#define _IMPL_SECURE_ZERO_MEMSET			_ossl_secure_zero_memset
+
+	_IMPLSTB void _ossl_secure_zero_memset(void* ptr, size_t size)
+	{
+		_sizet_check(size)
+
+		OPENSSL_cleanse(ptr, size);
+	}
+#endif
+
+#ifndef _IMPL_CRYPTO_FIXED_TIME_COMPARE
+
+	#define _IMPL_CRYPTO_FIXED_TIME_COMPARE		_ossl_fixed_time_compare
+
+	_IMPLSTB uint32_t _ossl_fixed_time_compare(const uint8_t* a, const uint8_t* b, uint32_t size)
+	{
+		int result;
+
+		_sizet_check(size)
+
+		result = CRYPTO_memcmp(a, b, size);
+
+		return (uint32_t)result;
+	}
+
+#endif /* _IMPL_CRYPTO_FIXED_TIME_COMPARE */
+
+
+#ifndef _IMPL_CRYPTO_SHA256_DIGEST	
+
+	#include <openssl/sha.h>
+
+	#define _IMPL_CRYPTO_SHA256_DIGEST			_ossl_sha256_digest	
+
+	_IMPLSTB cstatus_t _ossl_sha256_digest(const cspan_t* data, sha256_t digestOut32)
+	{
+		_sizet_check(data->size)
+
+		_OSSL_FAIL(SHA256(data->data, data->size, digestOut32))
+
+		return CSTATUS_OK;
+	}
+
+#endif
+
+#ifndef _IMPL_CRYPTO_SHA256_HMAC
+
+	#include <openssl/hmac.h>
+
+	/* Export function */
+	#define _IMPL_CRYPTO_SHA256_HMAC			_ossl_hmac_sha256	
+	
+	_IMPLSTB cstatus_t _ossl_hmac_sha256(const cspan_t* key, const cspan_t* data, sha256_t hmacOut32)
+	{
+		unsigned int hmacLen;
+
+		_sizet_check(key->size)
+		_sizet_check(data->size)
+
+		hmacLen = sizeof(sha256_t);
+
+		_OSSL_FAIL(
+			HMAC(
+				EVP_sha256(),
+				key->data,
+				key->size,
+				data->data,
+				data->size,
+				hmacOut32,
+				&hmacLen
+			)
+		)
+		
+		/* digest length should match the actual digest size */
+		_OSSL_FAIL(hmacLen != sizeof(sha256_t))
+
+		return CSTATUS_OK;
+	}
+
+#endif /* !_IMPL_CRYPTO_SHA256_HMAC */
+
+#ifndef _IMPL_CRYPTO_SHA256_HKDF_EXPAND
+	
+	#include <openssl/hmac.h>
+	#include "hkdf.h"
+
+	#define _IMPL_CRYPTO_SHA256_HKDF_EXPAND		_ossl_sha256_hkdf_expand
+
+	cstatus_t _ossl_hkdf_update(void* ctx, const cspan_t* data)
+	{
+		DEBUG_ASSERT(ctx != NULL)
+
+		_OSS_FAIL(HMAC_Update((HMAC_CTX*)ctx, data->data, data->size))
+		
+		return CSTATUS_OK;
+	}
+
+	cstatus_t _ossl_hkdf_finish(void* ctx, sha256_t hmacOut32)
+	{
+		DEBUG_ASSERT(ctx != NULL)
+
+		_OSSL_FAIL(HMAC_Final((HMAC_CTX*)ctx, hmacOut32, NULL))
+		
+		return CSTATUS_OK;
+	}
+
+	_IMPLSTB cstatus_t _ossl_fallback_hkdf_expand(const cspan_t* prk, const cspan_t* info, span_t* okm)
+	{
+		HMAC_CTX* hmac;
+		cstatus_t result;
+		struct nc_hkdf_fn_cb_struct handler;
 	
-}
+		/*
+		* NOTE! Hmac reusable flag must be set to allow for multiple
+		* calls to the finish function without losing the context.
+		*/
+
+		if ((hmac = HMAC_CTX_new()) == NULL)
+		{
+			return CSTATUS_FAIL;
+		}
+
+
+		_OSSL_FAIL(
+			HMAC_Init_ex(
+				hmac,
+				prk->data,
+				pkr->size,
+				EVP_sha256(),
+				NULL
+			)
+		)
+		
+		handler.update = _ossl_hkdf_update;
+		handler.finish = _ossl_hkdf_finish;
+
+		result = hkdfExpandProcess(&handler, hmac, info, okm);
+
+		HMAC_CTX_free(hmac);
+
+		return result;
+	}
 
+#endif /* !_IMPL_CRYPTO_SHA256_HKDF_EXPAND */
 
 #endif	/*!OPENSSL_CRYPTO_LIB */
\ No newline at end of file