Merge branch 'develop' into c-sharp

1 files changed, 45 insertions, 43 deletions

diff --git a/include/noscrypt.h b/include/noscrypt.h
index f408dfc..3702555 100644
--- a/include/noscrypt.h
+++ b/include/noscrypt.h
@@ -58,7 +58,7 @@ extern "C" {
 		#ifdef _NC_IS_WINDOWS
 			#define NC_EXPORT __declspec(dllimport)
 		#else
-			#define NC_EXPORT
+			#define NC_EXPORT extern
 		#endif /*  _NC_IS_WINDOWS */
 	#endif /*  !NOSCRYPT_EXPORTING */
 #endif /*  !NC_EXPORT */
@@ -68,7 +68,6 @@ extern "C" {
 */
 #define BIP340_PUBKEY_HEADER_BYTE		0x02
 #define NIP44_MESSAGE_KEY_SIZE			0x4c	/*32 + 12 + 32 = 76 */
-#define NC_ENCRYPTION_NONCE_SIZE		0x20
 #define NC_SEC_KEY_SIZE					0x20
 #define NC_PUBKEY_SIZE					0x20
 #define NC_CONTEXT_ENTROPY_SIZE			0x20
@@ -76,16 +75,17 @@ extern "C" {
 #define NC_CONV_KEY_SIZE				0x20
 #define NC_HMAC_KEY_SIZE				0x20
 #define NC_ENCRYPTION_MAC_SIZE			0x20
-#define NC_MESSAGE_KEY_SIZE NIP44_MESSAGE_KEY_SIZE
-#define NC_NIP04_AES_IV_SIZE			0x10	/* AES IV size is 16 bytes (aka cipher block size) */
+#define NC_MESSAGE_KEY_SIZE				NIP44_MESSAGE_KEY_SIZE
 #define NC_NIP04_AES_KEY_SIZE			0x20	/* AES 256 key size */
+#define NC_NIP44_IV_SIZE				0x20	/* 32 bytes */
+#define NC_NIP04_IV_SIZE				0x10	/* 16 bytes */
 
 /*
 * From spec
 * https://github.com/nostr-protocol/nips/blob/master/44.md#decryption
 */
 #define NIP44_MIN_ENC_MESSAGE_SIZE		0x01
-#define NIP44_MAX_ENC_MESSAGE_SIZE		0xffff
+#define NIP44_MAX_ENC_MESSAGE_SIZE		UINT16_MAX
 
 #define NC_ENC_VERSION_NIP04			0x04
 #define NC_ENC_VERSION_NIP44			0x2c
@@ -121,11 +121,31 @@ extern "C" {
 */
 
 #define NC_ENC_SET_VERSION			0x01
-#define NC_ENC_SET_NIP44_NONCE		0x02
+#define NC_ENC_SET_IV				0x02
 #define NC_ENC_SET_NIP44_MAC_KEY	0x03
 #define NC_ENC_SET_NIP04_KEY		0x04
-#define NC_ENC_SET_NIP04_IV			0x05
 
+/*
+* API NOTES:
+* 
+* - Decisions on integer width
+*   Since noscrypt will target general purpose processors and embedded 
+*   systems (future) I didn't want to risk word size issues causing under/overflow
+*   for the time being, so a fixed integer width was used and internal code
+*   supports and guards against the platform default integer width (size_t)
+* 
+*   I'd like to support 64bit stuff, but really the underlying systems don't 
+*   need to support that size buffer, nor do I expect platforms to have more than
+*   4GB sized buffers (int32_t), it's just not practial and most work is on 
+*   digests anyway. 
+* 
+* - Decisions on unsigned vs signed
+*   Yeah, I know this is a popular squabble in C land, but implementation details
+*   should not trouble the user. If I expect an unsigned int, then it should be 
+*   explicit, negative number guards are cumbersom to handle return codes with
+*   that IMO most engineers don't bother doing anyway or doing well at the very
+*   least, so I'm using unsgined integers. Sorry, not sorry.
+*/
 
 /* A compressed resul/return value, negative values 
 are failure, 0 is success and positive values are 
@@ -212,51 +232,26 @@ typedef struct nc_mac_verify {
 */
 
 /*
-* A helper function to cast a buffer to a NCSecretKey struct
-* @param key The buffer to cast
-* @return A pointer to the NCSecretKey struct
+* Casts a buffer pointer to a NCSecretKey pointer
 */
-static _nc_fn_inline NCSecretKey* NCToSecKey(uint8_t key[NC_SEC_KEY_SIZE])
-{
-	return (NCSecretKey*)key;
-}
+#define NCByteCastToSecretKey(key) (NCSecretKey*)key
 
 /*
-* A helper function to cast a buffer to a NCPublicKey struct
-* @param key The buffer to cast
-* @return A pointer to the NCPublicKey struct
+* Casts a buffer pointer to a NCPublicKey pointer
 */
-static _nc_fn_inline NCPublicKey* NCToPubKey(uint8_t key[NC_PUBKEY_SIZE])
-{
-	return (NCPublicKey*)key;
-}
+#define NCByteCastToPublicKey(key) (NCPublicKey*)key
 
-static _nc_fn_inline NCResult NCResultWithArgPosition(NCResult err, uint8_t argPosition)
-{
-	return -(((NCResult)argPosition << NC_ARG_POSITION_OFFSET) | -err);
-}
+
+NC_EXPORT NCResult NC_CC NCResultWithArgPosition(NCResult err, uint8_t argPosition);
 
 /*
 * Parses an error code and returns the error code and the argument position 
 that caused the error.
 * @param result The error code to parse
-* @param argPositionOut A pointer to the argument position to write to
+* @param argPositionOut A pointer to the argument position to write to (optionall, set to NULL of unobserved)
 * @return The error code
 */
-static _nc_fn_inline int NCParseErrorCode(NCResult result, uint8_t* argPositionOut)
-{
-	NCResult asPositive;
-	int code;
-
-	/* convert result to a positive value*/
-	asPositive = -result;
-
-	/* Get the error code from the lower 8 bits and the argument position from the upper 8 bits*/
-	code = -(asPositive & NC_ERROR_CODE_MASK);
-	*argPositionOut = (asPositive >> NC_ARG_POSITION_OFFSET) & 0xFF;
-
-	return code;
-}
+NC_EXPORT int NC_CC NCParseErrorCode(NCResult result, uint8_t* argPositionOut);
 
 /*--------------------------------------
 *		LIB CONTEXT API
@@ -603,7 +598,7 @@ NC_EXPORT NCResult NCComputeMac(
 * @return NC_SUCCESS if the operation was successful, otherwise an error code. Use NCParseErrorCode to
 * the error code and positional argument that caused the error.
 */
-NC_EXPORT NCResult NCSetEncryptionProperty(
+NC_EXPORT NCResult NCEncryptionSetProperty(
 	NCEncryptionArgs* args, 
 	uint32_t property,
 	uint32_t value
@@ -620,7 +615,7 @@ NC_EXPORT NCResult NCSetEncryptionProperty(
 * @return NC_SUCCESS if the operation was successful, otherwise an error code. Use NCParseErrorCode to
 * the error code and positional argument that caused the error.
 */
-NC_EXPORT NCResult NCSetEncryptionPropertyEx(
+NC_EXPORT NCResult NCEncryptionSetPropertyEx(
 	NCEncryptionArgs* args,
 	uint32_t property,
 	uint8_t* value,
@@ -637,13 +632,20 @@ NC_EXPORT NCResult NCSetEncryptionPropertyEx(
 * @return NC_SUCCESS if the operation was successful, otherwise an error code. Use NCParseErrorCode to
 * the error code and positional argument that caused the error.
 */
-NC_EXPORT NCResult NCSetEncryptionData(
+NC_EXPORT NCResult NCEncryptionSetData(
 	NCEncryptionArgs* args,
 	const uint8_t* input,
 	uint8_t* output,
 	uint32_t dataSize
 );
 
+/*
+* Gets the size of the encryption nonce (iv) for the given encryption version
+* @param version The encryption version to get the nonce size for
+* @return The size of the nonce in bytes, or 0 if the version is not supported
+*/
+NC_EXPORT uint32_t NCEncryptionGetIvSize(uint32_t version);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */