From cfe3f2496410161b784441b8667f1b401fa9ae2f Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 27 Apr 2013 04:41:34 -0700 Subject: [PATCH] sizes are unsigned. --- .../include/sodium/crypto_auth_hmacsha256.h | 4 ++-- .../include/sodium/crypto_auth_hmacsha512256.h | 4 ++-- .../sodium/crypto_box_curve25519xsalsa20poly1305.h | 12 ++++++------ src/libsodium/include/sodium/crypto_core_hsalsa20.h | 8 ++++---- src/libsodium/include/sodium/crypto_core_salsa20.h | 8 ++++---- src/libsodium/include/sodium/crypto_core_salsa2012.h | 8 ++++---- src/libsodium/include/sodium/crypto_core_salsa208.h | 8 ++++---- src/libsodium/include/sodium/crypto_hash_sha256.h | 4 ++-- src/libsodium/include/sodium/crypto_hash_sha512.h | 4 ++-- .../include/sodium/crypto_hashblocks_sha256.h | 4 ++-- .../include/sodium/crypto_hashblocks_sha512.h | 4 ++-- .../include/sodium/crypto_onetimeauth_poly1305.h | 4 ++-- .../sodium/crypto_secretbox_xsalsa20poly1305.h | 8 ++++---- .../include/sodium/crypto_shorthash_siphash24.h | 4 ++-- src/libsodium/include/sodium/crypto_sign_ed25519.h | 6 +++--- .../sodium/crypto_sign_edwards25519sha512batch.h | 6 +++--- .../include/sodium/crypto_stream_aes128ctr.h | 6 +++--- .../include/sodium/crypto_stream_aes256estream.h | 6 +++--- src/libsodium/include/sodium/crypto_stream_salsa20.h | 4 ++-- .../include/sodium/crypto_stream_salsa2012.h | 4 ++-- .../include/sodium/crypto_stream_salsa208.h | 4 ++-- .../include/sodium/crypto_stream_xsalsa20.h | 4 ++-- src/libsodium/include/sodium/crypto_verify_16.h | 2 +- src/libsodium/include/sodium/crypto_verify_32.h | 2 +- test/default/hash.c | 2 +- test/default/hash3.c | 2 +- test/default/shorthash.c | 2 +- 27 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h index a442da17..5a7a7a87 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_auth_hmacsha256_BYTES 32 -#define crypto_auth_hmacsha256_KEYBYTES 32 +#define crypto_auth_hmacsha256_BYTES 32U +#define crypto_auth_hmacsha256_KEYBYTES 32U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index 01222db7..250f8aaa 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_auth_hmacsha512256_BYTES 32 -#define crypto_auth_hmacsha512256_KEYBYTES 32 +#define crypto_auth_hmacsha512256_BYTES 32U +#define crypto_auth_hmacsha512256_KEYBYTES 32U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h index db2d90aa..754f573a 100644 --- a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h @@ -3,12 +3,12 @@ #include "export.h" -#define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24 -#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16 +#define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U +#define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U +#define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U +#define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U +#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES 32U +#define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U #define crypto_box_curve25519xsalsa20poly1305_MACBYTES (crypto_box_curve25519xsalsa20poly1305_ZEROBYTES - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES) #ifdef __cplusplus diff --git a/src/libsodium/include/sodium/crypto_core_hsalsa20.h b/src/libsodium/include/sodium/crypto_core_hsalsa20.h index c1063418..d7760ec7 100644 --- a/src/libsodium/include/sodium/crypto_core_hsalsa20.h +++ b/src/libsodium/include/sodium/crypto_core_hsalsa20.h @@ -3,10 +3,10 @@ #include "export.h" -#define crypto_core_hsalsa20_OUTPUTBYTES 32 -#define crypto_core_hsalsa20_INPUTBYTES 16 -#define crypto_core_hsalsa20_KEYBYTES 32 -#define crypto_core_hsalsa20_CONSTBYTES 16 +#define crypto_core_hsalsa20_OUTPUTBYTES 32U +#define crypto_core_hsalsa20_INPUTBYTES 16U +#define crypto_core_hsalsa20_KEYBYTES 32U +#define crypto_core_hsalsa20_CONSTBYTES 16U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_core_salsa20.h b/src/libsodium/include/sodium/crypto_core_salsa20.h index 84eebf2d..40d96f2e 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa20.h +++ b/src/libsodium/include/sodium/crypto_core_salsa20.h @@ -3,10 +3,10 @@ #include "export.h" -#define crypto_core_salsa20_OUTPUTBYTES 64 -#define crypto_core_salsa20_INPUTBYTES 16 -#define crypto_core_salsa20_KEYBYTES 32 -#define crypto_core_salsa20_CONSTBYTES 16 +#define crypto_core_salsa20_OUTPUTBYTES 64U +#define crypto_core_salsa20_INPUTBYTES 16U +#define crypto_core_salsa20_KEYBYTES 32U +#define crypto_core_salsa20_CONSTBYTES 16U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_core_salsa2012.h b/src/libsodium/include/sodium/crypto_core_salsa2012.h index 54526fa6..ac2b0d54 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_core_salsa2012.h @@ -3,10 +3,10 @@ #include "export.h" -#define crypto_core_salsa2012_OUTPUTBYTES 64 -#define crypto_core_salsa2012_INPUTBYTES 16 -#define crypto_core_salsa2012_KEYBYTES 32 -#define crypto_core_salsa2012_CONSTBYTES 16 +#define crypto_core_salsa2012_OUTPUTBYTES 64U +#define crypto_core_salsa2012_INPUTBYTES 16U +#define crypto_core_salsa2012_KEYBYTES 32U +#define crypto_core_salsa2012_CONSTBYTES 16U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h index 5a6183ca..89849d29 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa208.h +++ b/src/libsodium/include/sodium/crypto_core_salsa208.h @@ -3,10 +3,10 @@ #include "export.h" -#define crypto_core_salsa208_OUTPUTBYTES 64 -#define crypto_core_salsa208_INPUTBYTES 16 -#define crypto_core_salsa208_KEYBYTES 32 -#define crypto_core_salsa208_CONSTBYTES 16 +#define crypto_core_salsa208_OUTPUTBYTES 64U +#define crypto_core_salsa208_INPUTBYTES 16U +#define crypto_core_salsa208_KEYBYTES 32U +#define crypto_core_salsa208_CONSTBYTES 16U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h index 4b12267b..1de49b23 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha256.h +++ b/src/libsodium/include/sodium/crypto_hash_sha256.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_hash_sha256_BYTES 32 -#define crypto_hash_sha256_BLOCKBYTES 64 +#define crypto_hash_sha256_BYTES 32U +#define crypto_hash_sha256_BLOCKBYTES 64U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h index 5ea1c702..dcc5b5e7 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha512.h +++ b/src/libsodium/include/sodium/crypto_hash_sha512.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_hash_sha512_BYTES 64 -#define crypto_hash_sha512_BLOCKBYTES 128 +#define crypto_hash_sha512_BYTES 64U +#define crypto_hash_sha512_BLOCKBYTES 128U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h index 8cb5514d..ea523489 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_hashblocks_sha256_STATEBYTES 32 -#define crypto_hashblocks_sha256_BLOCKBYTES 64 +#define crypto_hashblocks_sha256_STATEBYTES 32U +#define crypto_hashblocks_sha256_BLOCKBYTES 64U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h index 4daf51ee..67cd32d6 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_hashblocks_sha512_STATEBYTES 64 -#define crypto_hashblocks_sha512_BLOCKBYTES 128 +#define crypto_hashblocks_sha512_STATEBYTES 64U +#define crypto_hashblocks_sha512_BLOCKBYTES 128U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h index e341f391..70289b4d 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_onetimeauth_poly1305_BYTES 16 -#define crypto_onetimeauth_poly1305_KEYBYTES 32 +#define crypto_onetimeauth_poly1305_BYTES 16U +#define crypto_onetimeauth_poly1305_KEYBYTES 32U #ifdef __cplusplus extern "C" { #endif diff --git a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h index eeca356b..b503cbb9 100644 --- a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h @@ -3,10 +3,10 @@ #include "export.h" -#define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32 -#define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24 -#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES 32 -#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16 +#define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U +#define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U +#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES 32U +#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h index 322ef50b..e2e32f62 100644 --- a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h +++ b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h @@ -3,8 +3,8 @@ #include "export.h" -#define crypto_shorthash_siphash24_BYTES 8 -#define crypto_shorthash_siphash24_KEYBYTES 16 +#define crypto_shorthash_siphash24_BYTES 8U +#define crypto_shorthash_siphash24_KEYBYTES 16U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_sign_ed25519.h b/src/libsodium/include/sodium/crypto_sign_ed25519.h index 1d481a4d..e98d0a10 100644 --- a/src/libsodium/include/sodium/crypto_sign_ed25519.h +++ b/src/libsodium/include/sodium/crypto_sign_ed25519.h @@ -3,9 +3,9 @@ #include "export.h" -#define crypto_sign_ed25519_SECRETKEYBYTES 64 -#define crypto_sign_ed25519_PUBLICKEYBYTES 32 -#define crypto_sign_ed25519_BYTES 64 +#define crypto_sign_ed25519_SECRETKEYBYTES 64U +#define crypto_sign_ed25519_PUBLICKEYBYTES 32U +#define crypto_sign_ed25519_BYTES 64U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h index 318d6174..b6a2f3c5 100644 --- a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h +++ b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h @@ -3,9 +3,9 @@ #include "export.h" -#define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES 64 -#define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32 -#define crypto_sign_edwards25519sha512batch_BYTES 64 +#define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES 64U +#define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U +#define crypto_sign_edwards25519sha512batch_BYTES 64U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h index c8cf836b..15d6366a 100644 --- a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h +++ b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h @@ -11,9 +11,9 @@ #include "export.h" -#define crypto_stream_aes128ctr_KEYBYTES 16 -#define crypto_stream_aes128ctr_NONCEBYTES 16 -#define crypto_stream_aes128ctr_BEFORENMBYTES 1408 +#define crypto_stream_aes128ctr_KEYBYTES 16U +#define crypto_stream_aes128ctr_NONCEBYTES 16U +#define crypto_stream_aes128ctr_BEFORENMBYTES 1408U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_stream_aes256estream.h b/src/libsodium/include/sodium/crypto_stream_aes256estream.h index 28626207..07c2277e 100644 --- a/src/libsodium/include/sodium/crypto_stream_aes256estream.h +++ b/src/libsodium/include/sodium/crypto_stream_aes256estream.h @@ -12,9 +12,9 @@ #include "export.h" -#define crypto_stream_aes256estream_KEYBYTES 32 -#define crypto_stream_aes256estream_NONCEBYTES 16 -#define crypto_stream_aes256estream_BEFORENMBYTES 276 +#define crypto_stream_aes256estream_KEYBYTES 32U +#define crypto_stream_aes256estream_NONCEBYTES 16U +#define crypto_stream_aes256estream_BEFORENMBYTES 276U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h index f814da02..d9f5fe2e 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa20.h @@ -11,8 +11,8 @@ #include "export.h" -#define crypto_stream_salsa20_KEYBYTES 32 -#define crypto_stream_salsa20_NONCEBYTES 8 +#define crypto_stream_salsa20_KEYBYTES 32U +#define crypto_stream_salsa20_NONCEBYTES 8U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h index e0bd60bd..18c3a73b 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h @@ -11,8 +11,8 @@ #include "export.h" -#define crypto_stream_salsa2012_KEYBYTES 32 -#define crypto_stream_salsa2012_NONCEBYTES 8 +#define crypto_stream_salsa2012_KEYBYTES 32U +#define crypto_stream_salsa2012_NONCEBYTES 8U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h index 2447f8dd..273395f0 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa208.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h @@ -11,8 +11,8 @@ #include "export.h" -#define crypto_stream_salsa208_KEYBYTES 32 -#define crypto_stream_salsa208_NONCEBYTES 8 +#define crypto_stream_salsa208_KEYBYTES 32U +#define crypto_stream_salsa208_NONCEBYTES 8U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h index 2eed4010..5f58c7ec 100644 --- a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h @@ -11,8 +11,8 @@ #include "export.h" -#define crypto_stream_xsalsa20_KEYBYTES 32 -#define crypto_stream_xsalsa20_NONCEBYTES 24 +#define crypto_stream_xsalsa20_KEYBYTES 32U +#define crypto_stream_xsalsa20_NONCEBYTES 24U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_verify_16.h b/src/libsodium/include/sodium/crypto_verify_16.h index 99d3c5c0..1c2c7b23 100644 --- a/src/libsodium/include/sodium/crypto_verify_16.h +++ b/src/libsodium/include/sodium/crypto_verify_16.h @@ -3,7 +3,7 @@ #include "export.h" -#define crypto_verify_16_BYTES 16 +#define crypto_verify_16_BYTES 16U #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_verify_32.h b/src/libsodium/include/sodium/crypto_verify_32.h index 4351483d..a76d1889 100644 --- a/src/libsodium/include/sodium/crypto_verify_32.h +++ b/src/libsodium/include/sodium/crypto_verify_32.h @@ -3,7 +3,7 @@ #include "export.h" -#define crypto_verify_32_BYTES 32 +#define crypto_verify_32_BYTES 32U #ifdef __cplusplus extern "C" { diff --git a/test/default/hash.c b/test/default/hash.c index 47950fc7..c24f9c49 100644 --- a/test/default/hash.c +++ b/test/default/hash.c @@ -8,7 +8,7 @@ unsigned char h[crypto_hash_BYTES]; int main(void) { - int i; + size_t i; crypto_hash(h,x,sizeof x - 1U); for (i = 0;i < crypto_hash_BYTES;++i) printf("%02x",(unsigned int) h[i]); printf("\n"); diff --git a/test/default/hash3.c b/test/default/hash3.c index 2fae6200..a5461258 100644 --- a/test/default/hash3.c +++ b/test/default/hash3.c @@ -8,7 +8,7 @@ unsigned char h[crypto_hash_sha512_BYTES]; int main(void) { - int i; + size_t i; crypto_hash_sha512(h,x,sizeof x - 1U); for (i = 0;i < crypto_hash_sha512_BYTES;++i) printf("%02x",(unsigned int) h[i]); printf("\n"); diff --git a/test/default/shorthash.c b/test/default/shorthash.c index a08a5db0..6f1d7f3c 100644 --- a/test/default/shorthash.c +++ b/test/default/shorthash.c @@ -9,7 +9,7 @@ int main(void) { #define MAXLEN 64 crypto_uint8 in[MAXLEN], out[crypto_shorthash_BYTES], k[crypto_shorthash_KEYBYTES]; - int i,j; + size_t i,j; for( i = 0; i < crypto_shorthash_KEYBYTES; ++i ) k[i] = i;