From e3d915143a5590ed5a7781a6a90703dad1b10ce7 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 1 Jul 2014 12:37:13 -0700 Subject: [PATCH] Use unsigned constants for all sizes --- .../sodium/crypto_pwhash_scryptsalsa208sha256.h | 12 ++++++------ .../include/sodium/crypto_scalarmult_curve25519.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h b/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h index 68bd5508..7de83955 100644 --- a/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h +++ b/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h @@ -12,27 +12,27 @@ extern "C" { #endif -#define crypto_pwhash_scryptsalsa208sha256_SALTBYTES 32 +#define crypto_pwhash_scryptsalsa208sha256_SALTBYTES 32U SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void); -#define crypto_pwhash_scryptsalsa208sha256_STRBYTES 102 +#define crypto_pwhash_scryptsalsa208sha256_STRBYTES 102U SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void); -#define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288 +#define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288ULL SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void); -#define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE 16777216 +#define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE 16777216ULL SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive(void); -#define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE 33554432 +#define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE 33554432ULL SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive(void); -#define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE 1073741824 +#define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE 1073741824ULL SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive(void); diff --git a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h index 50b6744a..c75d2242 100644 --- a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h +++ b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h @@ -9,11 +9,11 @@ extern "C" { #endif -#define crypto_scalarmult_curve25519_BYTES 32 +#define crypto_scalarmult_curve25519_BYTES 32U SODIUM_EXPORT size_t crypto_scalarmult_curve25519_bytes(void); -#define crypto_scalarmult_curve25519_SCALARBYTES 32 +#define crypto_scalarmult_curve25519_SCALARBYTES 32U SODIUM_EXPORT size_t crypto_scalarmult_curve25519_scalarbytes(void);