2 files changed, 246 insertions, 136 deletions

diff --git a/src/providers/openssl-helpers.c b/src/providers/openssl-helpers.c
index 42e98c3..bc3a272 100644
--- a/src/providers/openssl-helpers.c
+++ b/src/providers/openssl-helpers.c
@@ -24,22 +24,24 @@
 
 #define OSSL_SHA256 "SHA2-256"
 #define OSSL_HMAC "hmac"
-#define ossl_evp_fetch_chacha20() EVP_CIPHER_fetch(NULL, "ChaCha20", NULL)
+#define OSSL_CHACHA20 "ChaCha20"
 
 
 typedef enum {
 	
+	EvpStateTypeInvalid,
+
 	EvpStateTypeDigest,
 	
-	EvpStateTypeMac
+	EvpStateTypeMac,
+
+	EvpStateTypeCipher
 
 } _evp_state_type;
 
 struct ossl_evp_state {
 	void* _context;
-	void* _providerHandle;
-
-	OSSL_PARAM params[2];
+	void* _providerHandle;	
 
 	_evp_state_type type;
 
@@ -63,6 +65,14 @@ _IMPLSTB EVP_MD_CTX* _osslEvpGetMdContext(const struct ossl_evp_state* state)
 	return (EVP_MD_CTX*)state->_context;
 }
 
+_IMPLSTB EVP_CIPHER_CTX* _osslEvpGetCipherContext(const struct ossl_evp_state* state)
+{
+	DEBUG_ASSERT(state != NULL);
+	DEBUG_ASSERT(state->type == EvpStateTypeCipher);
+
+	return (EVP_CIPHER_CTX*)state->_context;
+}
+
 _IMPLSTB cspan_t _osslEvpGetPrk(const struct ossl_evp_state* state)
 {
 	DEBUG_ASSERT(state != NULL);
@@ -104,41 +114,135 @@ _IMPLSTB cstatus_t _osslEvpUpdate(const struct ossl_evp_state* state, cspan_t da
 		);
 		break;
 
+	default:
+		break;
 	}
 
 	return (cstatus_t)(result != 0);
 }
 
-_IMPLSTB cstatus_t _osslEvpFinal(const struct ossl_evp_state* state, span_t out)
+_IMPLSTB cstatus_t _osslEvpCipherUpdate(
+	const struct ossl_evp_state* state, 
+	cspan_t input, 
+	span_t output, 
+	int* bytesConsumed
+)
 {
 	int result;
-	size_t hmacLen;
-	unsigned int mdLen;
 
 	DEBUG_ASSERT(state != NULL);
+	DEBUG_ASSERT(state->_context != NULL);
+	DEBUG_ASSERT(state->type == EvpStateTypeCipher);
+
+	result = EVP_EncryptUpdate(
+		_osslEvpGetCipherContext(state),
+		ncSpanGetOffset(output, 0),
+		bytesConsumed,
+		ncSpanGetOffsetC(input, 0),
+		ncSpanGetSizeC(input)
+	);
 
-	result = 0;
-	mdLen = hmacLen = ncSpanGetSize(out);
+	return (cstatus_t)(result != 0);
+}
+
+_IMPLSTB cstatus_t __digestFinal(const struct ossl_evp_state* state, span_t out)
+{
+	int result;
+	unsigned int mdOut;
+
+	DEBUG_ASSERT(state != NULL);
+	DEBUG_ASSERT(state->type == EvpStateTypeDigest);
+
+	mdOut = ncSpanGetSize(out);
+
+	/* If the output span is empty, nothing to do */
+	if (mdOut == 0)
+	{
+		return CSTATUS_OK;
+	}
+
+	result = EVP_DigestFinal_ex(
+		_osslEvpGetMdContext(state),
+		ncSpanGetOffset(out, 0),
+		&mdOut
+	);
+
+	return (cstatus_t)(result != 0 && mdOut == ncSpanGetSize(out));
+}
+
+_IMPLSTB cstatus_t __macFinal(const struct ossl_evp_state* state, span_t out)
+{
+	int result;
+	size_t macOut;
+
+	DEBUG_ASSERT(state != NULL);
+	DEBUG_ASSERT(state->type == EvpStateTypeMac);
+
+	macOut = ncSpanGetSize(out);
+
+	/* If the output span is empty, nothing to do */
+	if (macOut == 0)
+	{
+		return CSTATUS_OK;
+	}
+
+	result = EVP_MAC_final(
+		_osslEvpGetMacContext(state),
+		ncSpanGetOffset(out, 0),
+		&macOut,
+		macOut
+	);
+
+	return (cstatus_t)(result != 0 && macOut == ncSpanGetSize(out));
+}
+
+_IMPLSTB cstatus_t __cipherFinal(const struct ossl_evp_state* state, span_t out)
+{
+	int result, cipherOut;
+
+	DEBUG_ASSERT(state != NULL);
+	DEBUG_ASSERT(state->type == EvpStateTypeCipher);
+	
+	/* guard small integer overflow */
+	if (ncSpanGetSize(out) > INT_MAX)
+	{
+		return CSTATUS_FAIL;
+	}
+
+	cipherOut = (int)ncSpanGetSize(out);
+
+	/* If the output span is empty, nothing to do */
+	if (cipherOut == 0)
+	{
+		return CSTATUS_OK;
+	}
+
+	result = EVP_CipherFinal_ex(
+		_osslEvpGetCipherContext(state),
+		ncSpanGetOffset(out, 0),
+		&cipherOut
+	);
+
+	return (cstatus_t)(result != 0 && cipherOut >= 0 && (uint32_t)cipherOut == ncSpanGetSize(out));
+}
+
+static cstatus_t _osslEvpFinal(const struct ossl_evp_state* state, span_t out)
+{
+	DEBUG_ASSERT(state != NULL);
 
 	switch (state->type)
 	{
 	case EvpStateTypeDigest:
-		result = EVP_DigestFinal_ex(
-			_osslEvpGetMdContext(state),
-			ncSpanGetOffset(out, 0),
-			&mdLen
-		);
-		
-		return (cstatus_t)(result != 0 && mdLen == ncSpanGetSize(out));
+		return __digestFinal(state, out);
 
 	case EvpStateTypeMac:
-		result = EVP_MAC_final(
-			_osslEvpGetMacContext(state),
-			ncSpanGetOffset(out, 0),
-			&hmacLen,
-			hmacLen
-		);
-		return (cstatus_t)(result != 0 && hmacLen == ncSpanGetSize(out));
+		return __macFinal(state, out);
+
+	case EvpStateTypeCipher:
+		return __cipherFinal(state, out);
+
+	default:
+		break;
 	}
 
 	/*
@@ -149,7 +253,7 @@ _IMPLSTB cstatus_t _osslEvpFinal(const struct ossl_evp_state* state, span_t out)
 	return CSTATUS_FAIL;
 }
 
-_IMPLSTB cstatus_t _osslEvpMacInit(const struct ossl_evp_state* state)
+_IMPLSTB cstatus_t _osslEvpMacInit(const struct ossl_evp_state* state, const OSSL_PARAM* params)
 {
 	int result;
 
@@ -161,12 +265,39 @@ _IMPLSTB cstatus_t _osslEvpMacInit(const struct ossl_evp_state* state)
 		_osslEvpGetMacContext(state),
 		ncSpanGetOffsetC(state->_prk, 0),
 		ncSpanGetSizeC(state->_prk),
-		state->params
+		params
 	);
 
 	return (cstatus_t)(result != 0);
 }
 
+_IMPLSTB cstatus_t _osslEvpCipherInit(const struct ossl_evp_state* state, cspan_t key, cspan_t iv)
+{
+	int osslResult;
+	const EVP_CIPHER* cipher;
+
+	DEBUG_ASSERT(state != NULL);
+
+	cipher = (const EVP_CIPHER*)state->_providerHandle;
+
+	/*
+	* Sanity check on key and IV sizes for the created
+	* cipher
+	*/
+	DEBUG_ASSERT((uint32_t)EVP_CIPHER_get_key_length(cipher) == ncSpanGetSizeC(key));
+	DEBUG_ASSERT((uint32_t)EVP_CIPHER_iv_length(cipher) == ncSpanGetSizeC(iv));
+
+	osslResult = EVP_EncryptInit_ex2(
+		_osslEvpGetCipherContext(state),
+		cipher,
+		ncSpanGetOffsetC(key, 0),
+		ncSpanGetOffsetC(iv, 0),
+		NULL
+	);
+
+	return (cstatus_t)(osslResult != 0);
+}
+
 _IMPLSTB void _osslEvpFree(struct ossl_evp_state* state)
 {
 	DEBUG_ASSERT(state != NULL);
@@ -181,6 +312,12 @@ _IMPLSTB void _osslEvpFree(struct ossl_evp_state* state)
 		if (state->_context) EVP_MAC_CTX_free(state->_context);
 		if (state->_providerHandle) EVP_MAC_free(state->_providerHandle);
 		break;
+	case EvpStateTypeCipher:
+		if (state->_context) EVP_CIPHER_CTX_free(state->_context);
+		if (state->_providerHandle) EVP_CIPHER_free(state->_providerHandle);
+		break;
+	default:
+		break;
 	}
 }
 
@@ -211,6 +348,11 @@ _IMPLSTB cstatus_t _osslEvpInit(
 		}
 
 		break;
+	case EvpStateTypeCipher:
+		state->_providerHandle = EVP_CIPHER_fetch(NULL, providerName, NULL);
+		state->_context = EVP_CIPHER_CTX_new();
+		break;
+
 	default:
 		return CSTATUS_FAIL;
 	}
@@ -231,7 +373,7 @@ _IMPLSTB cstatus_t _osslEvpInit(
 	{
 		if (
 			!EVP_DigestInit_ex(
-				(EVP_MD_CTX*)state->_context,
+				_osslEvpGetMdContext(state),
 				(EVP_MD*)state->_providerHandle,
 				NULL
 			)
diff --git a/src/providers/openssl.c b/src/providers/openssl.c
index 4b41f1a..73a7902 100644
--- a/src/providers/openssl.c
+++ b/src/providers/openssl.c
@@ -63,8 +63,7 @@
 	{
 		cstatus_t result;
 		span_t digestSpan;
-		struct ossl_evp_state evpState;
-		
+		struct ossl_evp_state evpState;		
 
 		DEBUG_ASSERT(digestOut32 != NULL);
 		DEBUG_ASSERT(ncSpanIsValidC(data));
@@ -112,7 +111,8 @@
 	_IMPLSTB cstatus_t _ossl_hmac_sha256(cspan_t key, cspan_t data, sha256_t hmacOut32)
 	{
 		cstatus_t result;
-		span_t digestSpan;		
+		span_t digestSpan;	
+		OSSL_PARAM params[2];
 		struct ossl_evp_state evpState;
 
 		result = CSTATUS_FAIL;
@@ -135,8 +135,8 @@
 		* before the context can be initialized
 		*/
 
-		evpState.params[0] = OSSL_PARAM_construct_utf8_string("digest", "sha256", 0);
-		evpState.params[1] = OSSL_PARAM_construct_end();
+		params[0] = OSSL_PARAM_construct_utf8_string("digest", "sha256", 0);
+		params[1] = OSSL_PARAM_construct_end();
 
 		/*
 		* PRK Data must be assigned before the hmac 
@@ -145,7 +145,7 @@
 
 		_osslEvpSetPrk(&evpState, key);
 	
-		if (!_osslEvpMacInit(&evpState))
+		if (!_osslEvpMacInit(&evpState, params))
 		{
 			goto Cleanup;
 		}
@@ -176,13 +176,22 @@
 
 	#define _IMPL_CRYPTO_SHA256_HKDF_EXPAND		_ossl_sha256_hkdf_expand
 
+	struct _hkdf_state {
+		OSSL_PARAM params[2];
+		struct ossl_evp_state evpState;
+	};
+
 	static cstatus_t _ossl_hkdf_update(void* ctx, cspan_t data)
 	{
+		const struct _hkdf_state* state;
+
 		DEBUG_ASSERT(ctx != NULL);
 		_overflow_check(data.size);
 
+		state = (const struct _hkdf_state*)ctx;
+
 		return _osslEvpUpdate(
-			(const struct ossl_evp_state*)ctx, 
+			&state->evpState, 
 			data
 		);
 	}
@@ -190,13 +199,15 @@
 	static cstatus_t _ossl_hkdf_finish(void* ctx, sha256_t hmacOut32)
 	{
 		span_t hmacSpan;
+		const struct _hkdf_state* state;
 
 		DEBUG_ASSERT(ctx != NULL);
 		DEBUG_ASSERT(hmacOut32 != NULL);
 
+		state = (const struct _hkdf_state*)ctx;
 		ncSpanInit(&hmacSpan, hmacOut32, sizeof(sha256_t));
 
-		if (!_osslEvpFinal((const struct ossl_evp_state*)ctx, hmacSpan))
+		if (!_osslEvpFinal(&state->evpState, hmacSpan))
 		{
 			return CSTATUS_FAIL;
 		}
@@ -206,14 +217,14 @@
 		* See lifecycle https://docs.openssl.org/3.0/man7/life_cycle-mac/#copyright
 		*/
 
-		return _osslEvpMacInit((const struct ossl_evp_state*)ctx);
+		return _osslEvpMacInit(&state->evpState, state->params);
 	}
 	
 
 	_IMPLSTB cstatus_t _ossl_sha256_hkdf_expand(cspan_t prk, cspan_t info, span_t okm)
 	{
 		cstatus_t result;
-		struct ossl_evp_state hkdfState;
+		struct _hkdf_state state;
 		struct nc_hkdf_fn_cb_struct handler;		
 
 		result = CSTATUS_FAIL;
@@ -230,15 +241,7 @@
 		*
 		* Params must also be set for sha256 digest for mac
 		*/
-		_osslEvpSetPrk(&hkdfState, prk);
-
-		hkdfState.params[0] = OSSL_PARAM_construct_utf8_string("digest", "sha256", 0);
-		hkdfState.params[1] = OSSL_PARAM_construct_end();		
-
-		if (!_osslEvpInit(&hkdfState, EvpStateTypeMac, OSSL_HMAC))
-		{
-			goto Cleanup;
-		}
+		_osslEvpSetPrk(&state.evpState, prk);
 
 		/*
 		* Silly openssl stuff. Enable hmac with sha256 using the system default
@@ -246,103 +249,38 @@
 		* we need to call update multiple times.
 		*/
 
-		if (_osslEvpMacInit(&hkdfState) != CSTATUS_OK)
-		{
-			goto Cleanup;
-		}
-
-		DEBUG_ASSERT(EVP_MAC_CTX_get_mac_size(_osslEvpGetMacContext(&hkdfState)) == sizeof(sha256_t));
-
-		/* Pass the library  */
-		result = hkdfExpandProcess(&handler, &hkdfState, info, okm);
-
-	Cleanup:
-
-		_osslEvpFree(&hkdfState);
-
-		return result;
-	}
-
-#endif /* !_IMPL_CRYPTO_SHA256_HKDF_EXPAND */
-
-#ifndef _IMPL_CHACHA20_CRYPT
-
-	#define _IMPL_CHACHA20_CRYPT _ossl_chacha20_crypt
-
-	_IMPLSTB cstatus_t _ossl_cipher_core(
-		const EVP_CIPHER* cipher,
-		cspan_t key,
-		cspan_t iv,
-		cspan_t input,
-		span_t output
-	)
-	{
-		cstatus_t result;
-		EVP_CIPHER_CTX* ctx;
-		int tempLen, osslResult;
-
-		DEBUG_ASSERT2(ncSpanGetSize(output) <= ncSpanGetSizeC(input), "Output buffer must be equal or larger than the input buffer");
-		DEBUG_ASSERT(cipher != NULL);
-
-		DEBUG_ASSERT((uint32_t)EVP_CIPHER_get_key_length(cipher) == ncSpanGetSizeC(key));
-		DEBUG_ASSERT((uint32_t)EVP_CIPHER_iv_length(cipher) == ncSpanGetSizeC(iv));
-
-		result = CSTATUS_FAIL;
-
-		ctx = EVP_CIPHER_CTX_new();
-
-		if (ctx == NULL)
-		{
-			goto Cleanup;
-		}
-
-		osslResult = EVP_EncryptInit_ex2(
-			ctx, 
-			cipher, 
-			ncSpanGetOffsetC(key, 0),
-			ncSpanGetOffsetC(iv, 0),
-			NULL
-		);
+		state.params[0] = OSSL_PARAM_construct_utf8_string("digest", "sha256", 0);
+		state.params[1] = OSSL_PARAM_construct_end();
 
-		if (!osslResult)
+		if (!_osslEvpInit(&state.evpState, EvpStateTypeMac, OSSL_HMAC))
 		{
 			goto Cleanup;
 		}
 
-		osslResult = EVP_EncryptUpdate(
-			ctx,
-			ncSpanGetOffset(output, 0),
-			&tempLen,
-			ncSpanGetOffsetC(input, 0),
-			ncSpanGetSizeC(input)
-		);
-
-		if (!osslResult)
+		if (_osslEvpMacInit(&state.evpState, state.params) != CSTATUS_OK)
 		{
 			goto Cleanup;
 		}
 
-		/*
-		* We can't get a pointer outside the range of the 
-		* output buffer
-		*/
-		if (((uint32_t)tempLen) < ncSpanGetSize(output))
-		{
-			if (!EVP_EncryptFinal_ex(ctx, ncSpanGetOffset(output, tempLen), &tempLen))
-			{
-				goto Cleanup;
-			}
-		}
+		/* Sanity check mac size */
+		DEBUG_ASSERT(EVP_MAC_CTX_get_mac_size(_osslEvpGetMacContext(&state.evpState)) == sizeof(sha256_t));
 
-		result = CSTATUS_OK;
+		/* Pass to the library  */
+		result = hkdfExpandProcess(&handler, &state, info, okm);
 
 	Cleanup:
 
-		if (ctx) EVP_CIPHER_CTX_free(ctx);
+		_osslEvpFree(&state.evpState);
 
 		return result;
 	}
 
+#endif /* !_IMPL_CRYPTO_SHA256_HKDF_EXPAND */
+
+#ifndef _IMPL_CHACHA20_CRYPT
+
+	#define _IMPL_CHACHA20_CRYPT _ossl_chacha20_crypt
+	
 	_IMPLSTB cstatus_t _ossl_chacha20_crypt(
 		const uint8_t* key,
 		const uint8_t* nonce,
@@ -352,12 +290,23 @@
 	)
 	{
 		cstatus_t result;
-		EVP_CIPHER* cipher;
+		struct ossl_evp_state state;
 		uint8_t chaChaIv[CHACHA_NONCE_SIZE + 4];
 		cspan_t keySpan, nonceSpan, inputSpan;
 		span_t outputSpan;
+		int bytesWritten;
 
 		result = CSTATUS_FAIL;
+		bytesWritten = 0;
+
+		/*
+		* Alloc and init the cipher state for ChaCha20 in 
+		* cipher mode
+		*/
+		if (!_osslEvpInit(&state, EvpStateTypeCipher, OSSL_CHACHA20))
+		{
+			goto Cleanup;
+		}
 
 		/*
 		* RFC 7539 ChaCha20 requires a 16 byte initialization vector. A 
@@ -375,24 +324,43 @@
 		ncSpanInitC(&inputSpan, input, dataLen);
 		ncSpanInit(&outputSpan, output, dataLen);
 
-		cipher = ossl_evp_fetch_chacha20();
+		if (!_osslEvpCipherInit(&state, keySpan, nonceSpan))
+		{
+			goto Cleanup;
+		}
 
-		if (cipher == NULL)
+		if (!_osslEvpCipherUpdate(&state, inputSpan, outputSpan, &bytesWritten))
 		{
 			goto Cleanup;
 		}
+		
+		/*
+		* Possible static asser that int size must be 32bit or smaller
+		*/
+		if (bytesWritten < 0 || bytesWritten > INT32_MAX)
+		{
+			goto Cleanup;
+		}
+
+		DEBUG_ASSERT((uint32_t)bytesWritten <= dataLen)
 
-		result = _ossl_cipher_core(
-			cipher, 
-			keySpan, 
-			nonceSpan, 
-			inputSpan, 
-			outputSpan
+		/* shift output span by consumed data amount */
+		outputSpan = ncSpanSlice(
+			outputSpan, 
+			(uint32_t)bytesWritten,
+			dataLen - (uint32_t)bytesWritten
 		);
 
+		if (!_osslEvpFinal(&state, outputSpan))
+		{
+			goto Cleanup;
+		}
+	
+		result = CSTATUS_OK;
+
 	Cleanup:
 		
-		if (cipher) EVP_CIPHER_free(cipher);
+		_osslEvpFree(&state);
 
 		return result;
 	}