From 71da95c8b4a6f78ecc11ba6a107e215a117b04d5 Mon Sep 17 00:00:00 2001 From: Joost Rijneveld Date: Wed, 12 Aug 2015 15:30:01 +0200 Subject: [PATCH] Change 'uint' to standard 'unsigned int' --- prg.c | 4 ++-- prg.h | 4 ++-- wots.c | 10 +++++----- xmss.c | 50 +++++++++++++++++++++++++------------------------- xmss_commons.c | 2 +- xmss_commons.h | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/prg.c b/prg.c index 915df75..f39473f 100644 --- a/prg.c +++ b/prg.c @@ -12,7 +12,7 @@ const unsigned char zero_nonce[12] = {0}; /** * Generates rlen output bytes using ChaCha20 with a zero nonce and counter = 0 */ -void prg(unsigned char *r, unsigned long long rlen, const unsigned char *key, uint key_len) +void prg(unsigned char *r, unsigned long long rlen, const unsigned char *key, unsigned int key_len) { CRYPTO_chacha_20_keystream(r, rlen, key, zero_nonce, 0); } @@ -21,7 +21,7 @@ void prg(unsigned char *r, unsigned long long rlen, const unsigned char *key, ui * Generates rlen output bytes using ChaCha20. * Nonce and counter are set depending on the address addr. */ -void prg_with_counter(unsigned char *r, unsigned long long rlen, const unsigned char *key, uint key_len, const unsigned char addr[16]) +void prg_with_counter(unsigned char *r, unsigned long long rlen, const unsigned char *key, unsigned int key_len, const unsigned char addr[16]) { int i; unsigned char nonce[12]; diff --git a/prg.h b/prg.h index 88b17e1..d95c787 100644 --- a/prg.h +++ b/prg.h @@ -12,11 +12,11 @@ Public domain. * Generates rlen output bytes using key_len-byte key and places them in r. * */ -void prg(unsigned char *r, unsigned long long rlen, const unsigned char *key, uint key_len); +void prg(unsigned char *r, unsigned long long rlen, const unsigned char *key, unsigned int key_len); /** * Generates rlen output bytes using key_len-byte key and hash address addr and places them in r. * */ -void prg_with_counter(unsigned char *r, unsigned long long rlen, const unsigned char *key, uint key_len, const unsigned char addr[16]); +void prg_with_counter(unsigned char *r, unsigned long long rlen, const unsigned char *key, unsigned int key_len, const unsigned char addr[16]); #endif diff --git a/wots.c b/wots.c index bbc7f87..c513413 100644 --- a/wots.c +++ b/wots.c @@ -57,7 +57,7 @@ static void expand_seed(unsigned char *outseeds, const unsigned char *inseed, co */ static void gen_chain(unsigned char *out, const unsigned char *in, int start, int steps, const wots_params *params, const unsigned char *pub_seed, unsigned char addr[16]) { - uint i,j; + unsigned int i,j; for(j=0;jn;j++) out[j] = in[j]; @@ -101,7 +101,7 @@ static void base_w(int *output, const unsigned char *input, int in_len, const wo */ static void base_w_alternative(int *output, unsigned char *input, int in_len, const wots_params *params) { - uint i = 0; + unsigned int i = 0; for(i = 0; i < in_len; i += 2) { output[i] = input[in_len - 1 - (i / 2)] >> 4; @@ -111,7 +111,7 @@ static void base_w_alternative(int *output, unsigned char *input, int in_len, co void wots_pkgen(unsigned char *pk, const unsigned char *sk, const wots_params *params, const unsigned char *pub_seed, unsigned char addr[16]) { - uint i; + unsigned int i; expand_seed(pk, sk, params); for(i=0;ilen;i++){ SET_CHAIN_ADDRESS(addr,i); @@ -127,7 +127,7 @@ void wots_sign(unsigned char *sig, const unsigned char *msg, const unsigned char { int basew[params->len]; int csum = 0; - uint i=0; + unsigned int i=0; base_w(basew, msg, params->m, params); @@ -166,7 +166,7 @@ void wots_pkFromSig(unsigned char *pk, const unsigned char *sig, const unsigned { int basew[params->len]; int csum = 0; - uint i=0; + unsigned int i=0; base_w(basew, msg, params->m, params); diff --git a/xmss.c b/xmss.c index 48b0245..9384ca5 100644 --- a/xmss.c +++ b/xmss.c @@ -132,10 +132,10 @@ void xmssmt_set_params(xmssmt_params *params, int m, int n, int h, int d, int w) */ static void l_tree(unsigned char *leaf, unsigned char *wots_pk, const xmss_params *params, const unsigned char *pub_seed, unsigned char addr[16]) { - uint l = params->wots_par.len; - uint n = params->n; + unsigned int l = params->wots_par.len; + unsigned int n = params->n; unsigned long i = 0; - uint height = 0; + unsigned int height = 0; //ADRS.setTreeHeight(0); SET_LTREE_TREE_HEIGHT(addr,height); @@ -192,8 +192,8 @@ static void gen_leaf_wots(unsigned char *leaf, const unsigned char *sk_seed, con static void treehash(unsigned char *node, int height, int index, const unsigned char *sk_seed, const xmss_params *params, const unsigned char *pub_seed, const unsigned char addr[16]) { - uint idx = index; - uint n = params->n; + unsigned int idx = index; + unsigned int n = params->n; // use three different addresses because at this point we use all three formats in parallel unsigned char ots_addr[16]; unsigned char ltree_addr[16]; @@ -240,7 +240,7 @@ static void treehash(unsigned char *node, int height, int index, const unsigned */ static void validate_authpath(unsigned char *root, const unsigned char *leaf, unsigned long leafidx, const unsigned char *authpath, const xmss_params *params, const unsigned char *pub_seed, unsigned char addr[16]) { - uint n = params->n; + unsigned int n = params->n; int i,j; unsigned char buffer[2*n]; @@ -295,7 +295,7 @@ static void validate_authpath(unsigned char *root, const unsigned char *leaf, un */ static void compute_authpath_wots(unsigned char *root, unsigned char *authpath, unsigned long leaf_idx, const unsigned char *sk_seed, const xmss_params *params, unsigned char *pub_seed, unsigned char addr[16]) { - uint i, j, level; + unsigned int i, j, level; int n = params->n; int h = params->h; @@ -355,8 +355,8 @@ static void compute_authpath_wots(unsigned char *root, unsigned char *authpath, */ int xmss_keypair(unsigned char *pk, unsigned char *sk, xmss_params *params) { - uint n = params->n; - uint m = params->m; + unsigned int n = params->n; + unsigned int m = params->m; // Set idx = 0 sk[0] = 0; sk[1] = 0; @@ -382,8 +382,8 @@ int xmss_keypair(unsigned char *pk, unsigned char *sk, xmss_params *params) */ int xmss_sign(unsigned char *sk, unsigned char *sig_msg, unsigned long long *sig_msg_len, const unsigned char *msg, unsigned long long msglen, const xmss_params *params) { - uint n = params->n; - uint m = params->m; + unsigned int n = params->n; + unsigned int m = params->m; // Extract SK unsigned long idx = ((unsigned long)sk[0] << 24) | ((unsigned long)sk[1] << 16) | ((unsigned long)sk[2] << 8) | sk[3]; @@ -474,8 +474,8 @@ int xmss_sign(unsigned char *sk, unsigned char *sig_msg, unsigned long long *sig */ int xmss_sign_open(unsigned char *msg, unsigned long long *msglen, const unsigned char *sig_msg, unsigned long long sig_msg_len, const unsigned char *pk, const xmss_params *params) { - uint n = params->n; - uint m = params->m; + unsigned int n = params->n; + unsigned int m = params->m; unsigned long long i, m_len; unsigned long idx=0; @@ -564,9 +564,9 @@ fail: */ int xmssmt_keypair(unsigned char *pk, unsigned char *sk, xmssmt_params *params) { - uint n = params->n; - uint m = params->m; - uint i; + unsigned int n = params->n; + unsigned int m = params->m; + unsigned int i; // Set idx = 0 for (i = 0; i < params->index_len; i++){ sk[i] = 0; @@ -594,10 +594,10 @@ int xmssmt_keypair(unsigned char *pk, unsigned char *sk, xmssmt_params *params) */ int xmssmt_sign(unsigned char *sk, unsigned char *sig_msg, unsigned long long *sig_msg_len, const unsigned char *msg, unsigned long long msglen, const xmssmt_params *params) { - uint n = params->n; - uint m = params->m; - uint tree_h = params->xmss_par.h; - uint idx_len = params->index_len; + unsigned int n = params->n; + unsigned int m = params->m; + unsigned int tree_h = params->xmss_par.h; + unsigned int idx_len = params->index_len; unsigned long long idx_tree; unsigned long long idx_leaf; unsigned long long i; @@ -686,7 +686,7 @@ int xmssmt_sign(unsigned char *sk, unsigned char *sig_msg, unsigned long long *s *sig_msg_len += tree_h*n; // Now loop over remaining layers... - uint j; + unsigned int j; for(j = 1; j < params->d; j++){ // Prepare Address idx_leaf = (idx_tree & ((1 << tree_h)-1)); @@ -723,11 +723,11 @@ int xmssmt_sign(unsigned char *sk, unsigned char *sig_msg, unsigned long long *s */ int xmssmt_sign_open(unsigned char *msg, unsigned long long *msglen, const unsigned char *sig_msg, unsigned long long sig_msg_len, const unsigned char *pk, const xmssmt_params *params) { - uint n = params->n; - uint m = params->m; + unsigned int n = params->n; + unsigned int m = params->m; - uint tree_h = params->xmss_par.h; - uint idx_len = params->index_len; + unsigned int tree_h = params->xmss_par.h; + unsigned int idx_len = params->index_len; unsigned long long idx_tree; unsigned long long idx_leaf; diff --git a/xmss_commons.c b/xmss_commons.c index 834fa5e..745de5e 100644 --- a/xmss_commons.c +++ b/xmss_commons.c @@ -8,7 +8,7 @@ Public domain. #include #include -void to_byte(unsigned char *out, uint in, int bytes) +void to_byte(unsigned char *out, unsigned int in, int bytes) { int i; for(i = 0; i < bytes; i++){ diff --git a/xmss_commons.h b/xmss_commons.h index 4b780cf..c8f0ab4 100644 --- a/xmss_commons.h +++ b/xmss_commons.h @@ -8,6 +8,6 @@ Public domain. #include -void to_byte(unsigned char *output, uint in, int bytes); +void to_byte(unsigned char *output, unsigned int in, int bytes); void hexdump(const unsigned char *a, size_t len); #endif \ No newline at end of file