feat: Add cipher mode mask and fix cc

VnUgE · Aug 8, 2024 · f58245b · f58245b
1 parent 7c8f910
commit f58245b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/noscryptutil.h b/include/noscryptutil.h
@@ -43,6 +43,8 @@ extern "C" {
 #define E_CIPHER_BAD_INPUT				-15
 #define E_CIPHER_BAD_INPUT_SIZE			-16
 
+#define NC_UTIL_CIPHER_MODE				0x01u
+
 #define NC_UTIL_CIPHER_MODE_ENCRYPT		0x00u
 #define NC_UTIL_CIPHER_MODE_DECRYPT		0x01u
 #define NC_UTIL_CIPHER_ZERO_ON_FREE		0x02u

diff --git a/src/noscryptutil.c b/src/noscryptutil.c
@@ -665,6 +665,10 @@ NC_EXPORT NCUtilCipherContext* NC_CC NCUtilCipherAlloc(uint32_t encVersion, uint
 
 	if (encCtx != NULL)
 	{
+		/* 
+		* Technically I should be using the NCEncSetProperty but this 
+		* is an acceptable shortcut for now, may break in future 
+		*/
 		encCtx->encArgs.version = encVersion;
 		encCtx->_flags = flags;
 	}
@@ -706,7 +710,7 @@ NC_EXPORT NCResult NC_CC NCUtilCipherInit(
 	CHECK_NULL_ARG(encCtx, 0);
 	CHECK_NULL_ARG(inputData, 1);
 
-	if ((encCtx->_flags & NC_UTIL_CIPHER_MODE_DECRYPT) > 0)
+	if ((encCtx->_flags & NC_UTIL_CIPHER_MODE) == NC_UTIL_CIPHER_MODE_DECRYPT)
 	{
 		/*
 		* Validate the input data for proper format for 
@@ -854,7 +858,7 @@ NC_EXPORT NCResult NC_CC NCUtilCipherReadOutput(
 	return (NCResult)encCtx->buffer.actualOutput.size;
 }
 
-NC_EXPORT NCResult NCUtilCipherSetProperty(
+NC_EXPORT NCResult NC_CC NCUtilCipherSetProperty(
 	NCUtilCipherContext* ctx,
 	uint32_t property,
 	uint8_t* value,
@@ -901,7 +905,7 @@ NC_EXPORT NCResult NC_CC NCUtilCipherUpdate(
 	{
 	case NC_ENC_VERSION_NIP44:
 
-		if ((encCtx->_flags & NC_UTIL_CIPHER_MODE_DECRYPT) > 0)
+		if ((encCtx->_flags & NC_UTIL_CIPHER_MODE) == NC_UTIL_CIPHER_MODE_DECRYPT)
 		{
 			return _nip44DecryptCompleteCore(libContext, sk, pk, encCtx);
 		}