Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

crypto: moved boost::lock_guard into a smaller scope

Browse Source
This commit is contained in:
stoffu 2017-06-20 08:27:31 +09:00
parent c9e0e944e9
commit 8da82256d4
No known key found for this signature in database
GPG Key ID: 41DAB8343A9EC012
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/crypto/crypto.cpp
View File

@ -81,12 +81,16 @@ namespace crypto {
} }
/* generate a random 32-byte (256-bit) integer and copy it to res */ /* generate a random 32-byte (256-bit) integer and copy it to res */
static inline void random_scalar(ec_scalar &res) { static inline void random_scalar_not_thread_safe(ec_scalar &res) {
unsigned char tmp[64]; unsigned char tmp[64];
generate_random_bytes_not_thread_safe(64, tmp); generate_random_bytes_not_thread_safe(64, tmp);
sc_reduce(tmp); sc_reduce(tmp);
memcpy(&res, tmp, 32); memcpy(&res, tmp, 32);
} }
static inline void random_scalar(ec_scalar &res) {
boost::lock_guard<boost::mutex> lock(random_lock);
random_scalar_not_thread_safe(res);
}
static inline void hash_to_scalar(const void *data, size_t length, ec_scalar &res) { static inline void hash_to_scalar(const void *data, size_t length, ec_scalar &res) {
cn_fast_hash(data, length, reinterpret_cast<hash &>(res)); cn_fast_hash(data, length, reinterpret_cast<hash &>(res));
@ -99,7 +103,6 @@ namespace crypto {
* *
*/ */
secret_key crypto_ops::generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover) { secret_key crypto_ops::generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover) {
boost::lock_guard<boost::mutex> lock(random_lock);
ge_p3 point; ge_p3 point;
secret_key rng; secret_key rng;
@ -205,7 +208,6 @@ namespace crypto {
}; };
void crypto_ops::generate_signature(const hash &prefix_hash, const public_key &pub, const secret_key &sec, signature &sig) { void crypto_ops::generate_signature(const hash &prefix_hash, const public_key &pub, const secret_key &sec, signature &sig) {
boost::lock_guard<boost::mutex> lock(random_lock);
ge_p3 tmp3; ge_p3 tmp3;
ec_scalar k; ec_scalar k;
s_comm buf; s_comm buf;
@ -405,7 +407,6 @@ POP_WARNINGS
const public_key *const *pubs, size_t pubs_count, const public_key *const *pubs, size_t pubs_count,
const secret_key &sec, size_t sec_index, const secret_key &sec, size_t sec_index,
signature *sig) { signature *sig) {
boost::lock_guard<boost::mutex> lock(random_lock);
size_t i; size_t i;
ge_p3 image_unp; ge_p3 image_unp;
ge_dsmp image_pre; ge_dsmp image_pre;