cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out locks in randombytes_salsa20

Browse Source 
These functions were not supposed to be thread-safe, and we can't
use crit_*() in the randombytes implementations anyway.
This commit is contained in:
Frank Denis 2017-02-10 18:01:06 +01:00
parent d5fc01b317
commit 727dae49e2
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
View File

@ -31,7 +31,6 @@
#include "randombytes.h" #include "randombytes.h"
#include "randombytes_salsa20_random.h" #include "randombytes_salsa20_random.h"
#include "utils.h" #include "utils.h"
#include "private/mutex.h"
#ifdef _WIN32 #ifdef _WIN32
# include <windows.h> # include <windows.h>
@ -306,7 +305,7 @@ randombytes_salsa20_random_rekey(const unsigned char * const mix)
} }
static void static void
randombytes_salsa20_random_stir_unlocked(void) randombytes_salsa20_random_stir(void)
{ {
/* constant to personalize the hash function */ /* constant to personalize the hash function */
const unsigned char hsigma[crypto_generichash_KEYBYTES] = { const unsigned char hsigma[crypto_generichash_KEYBYTES] = {
@ -364,30 +363,18 @@ randombytes_salsa20_random_stir_unlocked(void)
#endif #endif
} }
static void
randombytes_salsa20_random_stir(void)
{
if (sodium_crit_enter() != 0) {
abort();
}
randombytes_salsa20_random_stir_unlocked();
if (sodium_crit_leave() != 0) {
abort();
}
}
static void static void
randombytes_salsa20_random_stir_if_needed(void) randombytes_salsa20_random_stir_if_needed(void)
{ {
#ifdef HAVE_GETPID #ifdef HAVE_GETPID
if (stream.initialized == 0) { if (stream.initialized == 0) {
randombytes_salsa20_random_stir_unlocked(); randombytes_salsa20_random_stir();
} else if (stream.pid != getpid()) { } else if (stream.pid != getpid()) {
abort(); abort();
} }
#else #else
if (stream.initialized == 0) { if (stream.initialized == 0) {
randombytes_salsa20_random_stir_unlocked(); randombytes_salsa20_random_stir();
} }
#endif #endif
} }
@ -397,9 +384,6 @@ randombytes_salsa20_random_close(void)
{ {
int ret = -1; int ret = -1;
if (sodium_crit_enter() != 0) {
abort();
}
#ifndef _WIN32 #ifndef _WIN32
if (stream.random_data_source_fd != -1 && if (stream.random_data_source_fd != -1 &&
close(stream.random_data_source_fd) == 0) { close(stream.random_data_source_fd) == 0) {
@ -427,9 +411,6 @@ randombytes_salsa20_random_close(void)
ret = 0; ret = 0;
} }
#endif #endif
if (sodium_crit_leave() != 0) {
abort();
}
return ret; return ret;
} }
@ -439,9 +420,6 @@ randombytes_salsa20_random_buf(void * const buf, const size_t size)
size_t i; size_t i;
int ret; int ret;
if (sodium_crit_enter() != 0) {
abort();
}
randombytes_salsa20_random_stir_if_needed(); randombytes_salsa20_random_stir_if_needed();
COMPILER_ASSERT(sizeof stream.nonce == crypto_stream_salsa20_NONCEBYTES); COMPILER_ASSERT(sizeof stream.nonce == crypto_stream_salsa20_NONCEBYTES);
#ifdef ULONG_LONG_MAX #ifdef ULONG_LONG_MAX
@ -457,9 +435,6 @@ randombytes_salsa20_random_buf(void * const buf, const size_t size)
stream.nonce++; stream.nonce++;
crypto_stream_salsa20_xor(stream.key, stream.key, sizeof stream.key, crypto_stream_salsa20_xor(stream.key, stream.key, sizeof stream.key,
(unsigned char *) &stream.nonce, stream.key); (unsigned char *) &stream.nonce, stream.key);
if (sodium_crit_leave() != 0) {
abort();
}
} }
static uint32_t static uint32_t
@ -468,9 +443,6 @@ randombytes_salsa20_random(void)
uint32_t val; uint32_t val;
int ret; int ret;
if (sodium_crit_enter() != 0) {
abort();
}
COMPILER_ASSERT(sizeof stream.rnd32 >= (sizeof stream.key) + (sizeof val)); COMPILER_ASSERT(sizeof stream.rnd32 >= (sizeof stream.key) + (sizeof val));
COMPILER_ASSERT(((sizeof stream.rnd32) - (sizeof stream.key)) COMPILER_ASSERT(((sizeof stream.rnd32) - (sizeof stream.key))
% sizeof val == (size_t) 0U); % sizeof val == (size_t) 0U);
@ -489,9 +461,7 @@ randombytes_salsa20_random(void)
stream.rnd32_outleft -= sizeof val; stream.rnd32_outleft -= sizeof val;
memcpy(&val, &stream.rnd32[stream.rnd32_outleft], sizeof val); memcpy(&val, &stream.rnd32[stream.rnd32_outleft], sizeof val);
memset(&stream.rnd32[stream.rnd32_outleft], 0, sizeof val); memset(&stream.rnd32[stream.rnd32_outleft], 0, sizeof val);
if (sodium_crit_leave() != 0) {
abort();
}
return val; return val;
} }