rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 10:37:37 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3800

Browse Source 
9317bce9 crypto: more places needing fixing for GCC 8.1 (moneroexamples)
4a72d595 chacha: fix build with GCC 8.1 (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-05-21 21:58:49 +02:00
commit a2cef8cba4
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/chacha.h
View File

@ -73,14 +73,14 @@ namespace crypto {
static_assert(sizeof(chacha_key) <= sizeof(hash), "Size of hash must be at least that of chacha_key"); static_assert(sizeof(chacha_key) <= sizeof(hash), "Size of hash must be at least that of chacha_key");
tools::scrubbed_arr<char, HASH_SIZE> pwd_hash; tools::scrubbed_arr<char, HASH_SIZE> pwd_hash;
crypto::cn_slow_hash(data, size, pwd_hash.data(), 0/*variant*/, 0/*prehashed*/); crypto::cn_slow_hash(data, size, pwd_hash.data(), 0/*variant*/, 0/*prehashed*/);
memcpy(&key, pwd_hash.data(), sizeof(key)); memcpy(&unwrap(key), pwd_hash.data(), sizeof(key));
} }
inline void generate_chacha_key_prehashed(const void *data, size_t size, chacha_key& key) { inline void generate_chacha_key_prehashed(const void *data, size_t size, chacha_key& key) {
static_assert(sizeof(chacha_key) <= sizeof(hash), "Size of hash must be at least that of chacha_key"); static_assert(sizeof(chacha_key) <= sizeof(hash), "Size of hash must be at least that of chacha_key");
tools::scrubbed_arr<char, HASH_SIZE> pwd_hash; tools::scrubbed_arr<char, HASH_SIZE> pwd_hash;
crypto::cn_slow_hash(data, size, pwd_hash.data(), 0/*variant*/, 1/*prehashed*/); crypto::cn_slow_hash(data, size, pwd_hash.data(), 0/*variant*/, 1/*prehashed*/);
memcpy(&key, pwd_hash.data(), sizeof(key)); memcpy(&unwrap(key), pwd_hash.data(), sizeof(key));
} }
inline void generate_chacha_key(std::string password, chacha_key& key) { inline void generate_chacha_key(std::string password, chacha_key& key) {

20
src/crypto/crypto.cpp
View File

@ -124,9 +124,9 @@ namespace crypto {
random_scalar(rng); random_scalar(rng);
} }
sec = rng; sec = rng;
sc_reduce32(&sec); // reduce in case second round of keys (sendkeys) sc_reduce32(&unwrap(sec)); // reduce in case second round of keys (sendkeys)
ge_scalarmult_base(&point, &sec); ge_scalarmult_base(&point, &unwrap(sec));
ge_p3_tobytes(&pub, &point); ge_p3_tobytes(&pub, &point);
return rng; return rng;
@ -139,10 +139,10 @@ namespace crypto {
bool crypto_ops::secret_key_to_public_key(const secret_key &sec, public_key &pub) { bool crypto_ops::secret_key_to_public_key(const secret_key &sec, public_key &pub) {
ge_p3 point; ge_p3 point;
if (sc_check(&sec) != 0) { if (sc_check(&unwrap(sec)) != 0) {
return false; return false;
} }
ge_scalarmult_base(&point, &sec); ge_scalarmult_base(&point, &unwrap(sec));
ge_p3_tobytes(&pub, &point); ge_p3_tobytes(&pub, &point);
return true; return true;
} }
@ -155,7 +155,7 @@ namespace crypto {
if (ge_frombytes_vartime(&point, &key1) != 0) { if (ge_frombytes_vartime(&point, &key1) != 0) {
return false; return false;
} }
ge_scalarmult(&point2, &key2, &point); ge_scalarmult(&point2, &unwrap(key2), &point);
ge_mul8(&point3, &point2); ge_mul8(&point3, &point2);
ge_p1p1_to_p2(&point2, &point3); ge_p1p1_to_p2(&point2, &point3);
ge_tobytes(&derivation, &point2); ge_tobytes(&derivation, &point2);
@ -199,7 +199,7 @@ namespace crypto {
ec_scalar scalar; ec_scalar scalar;
assert(sc_check(&base) == 0); assert(sc_check(&base) == 0);
derivation_to_scalar(derivation, output_index, scalar); derivation_to_scalar(derivation, output_index, scalar);
sc_add(&derived_key, &base, &scalar); sc_add(&unwrap(derived_key), &unwrap(base), &scalar);
} }
bool crypto_ops::derive_subaddress_public_key(const public_key &out_key, const key_derivation &derivation, std::size_t output_index, public_key &derived_key) { bool crypto_ops::derive_subaddress_public_key(const public_key &out_key, const key_derivation &derivation, std::size_t output_index, public_key &derived_key) {
@ -254,7 +254,7 @@ namespace crypto {
ge_scalarmult_base(&tmp3, &k); ge_scalarmult_base(&tmp3, &k);
ge_p3_tobytes(&buf.comm, &tmp3); ge_p3_tobytes(&buf.comm, &tmp3);
hash_to_scalar(&buf, sizeof(s_comm), sig.c); hash_to_scalar(&buf, sizeof(s_comm), sig.c);
sc_mulsub(&sig.r, &sig.c, &sec, &k); sc_mulsub(&sig.r, &sig.c, &unwrap(sec), &k);
} }
bool crypto_ops::check_signature(const hash &prefix_hash, const public_key &pub, const signature &sig) { bool crypto_ops::check_signature(const hash &prefix_hash, const public_key &pub, const signature &sig) {
@ -347,7 +347,7 @@ namespace crypto {
hash_to_scalar(&buf, sizeof(buf), sig.c); hash_to_scalar(&buf, sizeof(buf), sig.c);
// sig.r = k - sig.c*r // sig.r = k - sig.c*r
sc_mulsub(&sig.r, &sig.c, &r, &k); sc_mulsub(&sig.r, &sig.c, &unwrap(r), &k);
} }
bool crypto_ops::check_tx_proof(const hash &prefix_hash, const public_key &R, const public_key &A, const boost::optional<public_key> &B, const public_key &D, const signature &sig) { bool crypto_ops::check_tx_proof(const hash &prefix_hash, const public_key &R, const public_key &A, const boost::optional<public_key> &B, const public_key &D, const signature &sig) {
@ -451,7 +451,7 @@ namespace crypto {
ge_p2 point2; ge_p2 point2;
assert(sc_check(&sec) == 0); assert(sc_check(&sec) == 0);
hash_to_ec(pub, point); hash_to_ec(pub, point);
ge_scalarmult(&point2, &sec, &point); ge_scalarmult(&point2, &unwrap(sec), &point);
ge_tobytes(&image, &point2); ge_tobytes(&image, &point2);
} }
@ -530,7 +530,7 @@ POP_WARNINGS
} }
hash_to_scalar(buf.get(), rs_comm_size(pubs_count), h); hash_to_scalar(buf.get(), rs_comm_size(pubs_count), h);
sc_sub(&sig[sec_index].c, &h, &sum); sc_sub(&sig[sec_index].c, &h, &sum);
sc_mulsub(&sig[sec_index].r, &sig[sec_index].c, &sec, &k); sc_mulsub(&sig[sec_index].r, &sig[sec_index].c, &unwrap(sec), &k);
} }
bool crypto_ops::check_ring_signature(const hash &prefix_hash, const key_image &image, bool crypto_ops::check_ring_signature(const hash &prefix_hash, const key_image &image,