From a62debace47228f2a671de803aa9df37c9587a4c Mon Sep 17 00:00:00 2001 From: abderraouf-adjal Date: Tue, 8 Dec 2015 17:29:33 +0100 Subject: [PATCH] Replace 'unsigned int' with 'uint16_t' --- README.txt | 12 ++++++------ SpritzCipher.cpp | 16 ++++++++-------- SpritzCipher.h | 24 ++++++++++++------------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.txt b/README.txt index 501e2cb..24ffbc2 100644 --- a/README.txt +++ b/README.txt @@ -44,12 +44,12 @@ See for the details. ======================== void spritz_hash(uint8_t *digest, uint8_t digestLen, - const uint8_t *data, unsigned int dataLen) + const uint8_t *data, uint16_t dataLen) # Spritz cryptographic hash function. void spritz_mac(uint8_t *digest, uint8_t digestLen, - const uint8_t *msg, unsigned int msgLen, - const uint8_t *key, unsigned int keyLen) + const uint8_t *msg, uint16_t msgLen, + const uint8_t *key, uint16_t keyLen) # Spritz Message Authentication Code (MAC) function. ======================== @@ -57,7 +57,7 @@ See for the details. # Setup spritz hash state. void spritz_hash_update(spritz_ctx *hash_ctx, - const uint8_t *data, unsigned int dataLen) + const uint8_t *data, uint16_t dataLen) # Add data chunk to hash. void spritz_hash_final(spritz_ctx *hash_ctx, @@ -66,11 +66,11 @@ See for the details. ======================== void spritz_mac_setup(spritz_ctx *mac_ctx, - const uint8_t *key, unsigned int keyLen) + const uint8_t *key, uint16_t keyLen) # Setup spritz MAC state. void spritz_mac_update(spritz_ctx *mac_ctx, - const uint8_t *msg, unsigned int msgLen) + const uint8_t *msg, uint16_t msgLen) # Add message/data chunk to MAC. void spritz_mac_final(spritz_ctx *mac_ctx, diff --git a/SpritzCipher.cpp b/SpritzCipher.cpp index e11360f..541ed19 100644 --- a/SpritzCipher.cpp +++ b/SpritzCipher.cpp @@ -129,9 +129,9 @@ absorb(spritz_ctx *ctx, const uint8_t octet) absorbNibble(ctx, octet / 16); /* High */ } static void -absorbBytes(spritz_ctx *ctx, const uint8_t *buf, unsigned int len) +absorbBytes(spritz_ctx *ctx, const uint8_t *buf, uint16_t len) { - unsigned int i; + uint16_t i; for (i = 0; i < len; i++) { absorb(ctx, buf[i]); } @@ -237,7 +237,7 @@ spritz_hash_setup(spritz_ctx *hash_ctx) /* Add data chunk to hash */ void spritz_hash_update(spritz_ctx *hash_ctx, - const uint8_t *data, unsigned int dataLen) + const uint8_t *data, uint16_t dataLen) { absorbBytes(hash_ctx, data, dataLen); } @@ -258,7 +258,7 @@ spritz_hash_final(spritz_ctx *hash_ctx, /* Cryptographic hash function */ void spritz_hash(uint8_t *digest, uint8_t digestLen, - const uint8_t *data, unsigned int dataLen) + const uint8_t *data, uint16_t dataLen) { spritz_ctx hash_ctx; spritz_hash_setup(&hash_ctx); @@ -270,7 +270,7 @@ spritz_hash(uint8_t *digest, uint8_t digestLen, /* Setup spritz MAC state (spritz_ctx) */ void spritz_mac_setup(spritz_ctx *mac_ctx, - const uint8_t *key, unsigned int keyLen) + const uint8_t *key, uint16_t keyLen) { stateInit(mac_ctx); /* Like spritz_hash_update() */ absorbBytes(mac_ctx, key, keyLen); @@ -280,7 +280,7 @@ spritz_mac_setup(spritz_ctx *mac_ctx, /* Add message/data chunk to MAC */ void spritz_mac_update(spritz_ctx *mac_ctx, - const uint8_t *msg, unsigned int msgLen) + const uint8_t *msg, uint16_t msgLen) { absorbBytes(mac_ctx, msg, msgLen); /* Like spritz_hash_update() */ } @@ -296,8 +296,8 @@ spritz_mac_final(spritz_ctx *mac_ctx, /* Message Authentication Code (MAC) function */ void spritz_mac(uint8_t *digest, uint8_t digestLen, - const uint8_t *msg, unsigned int msgLen, - const uint8_t *key, unsigned int keyLen) + const uint8_t *msg, uint16_t msgLen, + const uint8_t *key, uint16_t keyLen) { spritz_ctx mac_ctx; spritz_mac_setup(&mac_ctx, key, keyLen); diff --git a/SpritzCipher.h b/SpritzCipher.h index c932596..aa65744 100644 --- a/SpritzCipher.h +++ b/SpritzCipher.h @@ -27,7 +27,7 @@ #define _SPRITZCIPHER_H -#include /* For uint8_t */ +#include /* For uint8_t & uint16_t */ /** \def SAFE_TIMING_CRUSH @@ -99,7 +99,7 @@ spritz_rand_byte(spritz_ctx *ctx); void spritz_hash_setup(spritz_ctx *hash_ctx); -/** \fn void spritz_hash_update(spritz_ctx *hash_ctx, const uint8_t *data, unsigned int dataLen) +/** \fn void spritz_hash_update(spritz_ctx *hash_ctx, const uint8_t *data, uint16_t dataLen) * \brief Add data chunk to hash * \param hash_ctx the hash context (ctx) * \param data the data chunk to hash @@ -107,7 +107,7 @@ spritz_hash_setup(spritz_ctx *hash_ctx); */ void spritz_hash_update(spritz_ctx *hash_ctx, - const uint8_t *data, unsigned int dataLen); + const uint8_t *data, uint16_t dataLen); /** \fn void spritz_hash_final(spritz_ctx *hash_ctx, uint8_t *digest, uint8_t digestLen) * \brief Output hash digest @@ -119,7 +119,7 @@ void spritz_hash_final(spritz_ctx *hash_ctx, uint8_t *digest, uint8_t digestLen); -/** \fn void spritz_hash(uint8_t *digest, uint8_t digestLen, const uint8_t *data, unsigned int dataLen) +/** \fn void spritz_hash(uint8_t *digest, uint8_t digestLen, const uint8_t *data, uint16_t dataLen) * \brief cryptographic hash function * \param digest the digest (Hash) output * \param digestLen length of the digest in bytes @@ -128,10 +128,10 @@ spritz_hash_final(spritz_ctx *hash_ctx, */ void spritz_hash(uint8_t *digest, uint8_t digestLen, - const uint8_t *data, unsigned int dataLen); + const uint8_t *data, uint16_t dataLen); -/** \fn void spritz_mac_setup(spritz_ctx *mac_ctx, const uint8_t *key, unsigned int keyLen) +/** \fn void spritz_mac_setup(spritz_ctx *mac_ctx, const uint8_t *key, uint16_t keyLen) * \brief Setup spritz MAC state (spritz_ctx) * \param mac_ctx the MAC context (ctx) * \param key the secret key @@ -139,9 +139,9 @@ spritz_hash(uint8_t *digest, uint8_t digestLen, */ void spritz_mac_setup(spritz_ctx *mac_ctx, - const uint8_t *key, unsigned int keyLen); + const uint8_t *key, uint16_t keyLen); -/** \fn void spritz_mac_update(spritz_ctx *mac_ctx, const uint8_t *msg, unsigned int msgLen) +/** \fn void spritz_mac_update(spritz_ctx *mac_ctx, const uint8_t *msg, uint16_t msgLen) * \brief Add message/data chunk to MAC * \param hash_ctx the hash context (ctx) * \param msg the message chunk to be authenticated @@ -149,7 +149,7 @@ spritz_mac_setup(spritz_ctx *mac_ctx, */ void spritz_mac_update(spritz_ctx *mac_ctx, - const uint8_t *msg, unsigned int msgLen); + const uint8_t *msg, uint16_t msgLen); /** \fn void spritz_mac_final(spritz_ctx *mac_ctx, uint8_t *digest, uint8_t digestLen) * \brief Output MAC digest @@ -161,7 +161,7 @@ void spritz_mac_final(spritz_ctx *mac_ctx, uint8_t *digest, uint8_t digestLen); -/** \fn void spritz_mac(uint8_t *digest, uint8_t digestLen, const uint8_t *msg, unsigned int msgLen, const uint8_t *key, unsigned int keyLen) +/** \fn void spritz_mac(uint8_t *digest, uint8_t digestLen, const uint8_t *msg, uint16_t msgLen, const uint8_t *key, uint16_t keyLen) * \brief message authentication code (MAC) function * \param digest MAC digest output. * \param digestLen length of the digest in bytes @@ -172,8 +172,8 @@ spritz_mac_final(spritz_ctx *mac_ctx, */ void spritz_mac(uint8_t *digest, uint8_t digestLen, - const uint8_t *msg, unsigned int msgLen, - const uint8_t *key, unsigned int keyLen); + const uint8_t *msg, uint16_t msgLen, + const uint8_t *key, uint16_t keyLen); #endif /* SpritzCipher.h */