From da448c38e4f0b7a2715a5832172e6aa9643cc748 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 25 Mar 2016 09:55:37 +0100 Subject: [PATCH] Nits --- .../scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c | 4 ++-- src/libsodium/sodium/runtime.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c index 4b3b80aa..7cf9f70e 100644 --- a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +++ b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c @@ -11,8 +11,8 @@ #include "utils.h" #define SETTING_SIZE(saltbytes) \ - (sizeof "$7$" - 1U) + \ - (1U /* N_log2 */) + (5U /* r */) + (5U /* p */) + BYTES2CHARS(saltbytes) + ((sizeof "$7$" - 1U) + \ + (1U /* N_log2 */) + (5U /* r */) + (5U /* p */) + BYTES2CHARS(saltbytes)) static int pickparams(unsigned long long opslimit, const size_t memlimit, diff --git a/src/libsodium/sodium/runtime.c b/src/libsodium/sodium/runtime.c index 7eeb0402..f6d7576f 100644 --- a/src/libsodium/sodium/runtime.c +++ b/src/libsodium/sodium/runtime.c @@ -98,6 +98,7 @@ _cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type) "0" (cpu_info_type), "2" (0U)); # endif #else + (void) cpu_info_type; cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0; #endif }