monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: revert odd namespace changes made in #3303

Browse source
This commit is contained in:
stoffu 2018-03-05 17:20:36 +09:00
parent 8705beaf51
commit b2d23b189e
No known key found for this signature in database
GPG key ID: 41DAB8343A9EC012
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/crypto/crypto.cpp
View file

@ -436,7 +436,7 @@ namespace crypto {
return sc_isnonzero(&c2) == 0; return sc_isnonzero(&c2) == 0;
} }
void crypto_ops::hash_to_ec(const public_key &key, ge_p3 &res) { static void hash_to_ec(const public_key &key, ge_p3 &res) {
hash h; hash h;
ge_p2 point; ge_p2 point;
ge_p1p1 point2; ge_p1p1 point2;

9
src/crypto/crypto.h
View file

@ -46,9 +46,6 @@
#include "hex.h" #include "hex.h"
#include "span.h" #include "span.h"
#include "hash.h" #include "hash.h"
extern "C" {
#include "crypto-ops.h"
}
namespace crypto { namespace crypto {
@ -116,9 +113,6 @@ namespace crypto {
void operator=(const crypto_ops &); void operator=(const crypto_ops &);
~crypto_ops(); ~crypto_ops();
static void hash_to_ec(const public_key &key, ge_p3 &res) ;
friend void hash_to_ec(const public_key &key, ge_p3 &res) ;
static secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false); static secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false);
friend secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover); friend secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover);
static bool check_key(const public_key &); static bool check_key(const public_key &);
@ -172,9 +166,6 @@ namespace crypto {
return res; return res;
} }
inline void hash_to_ec(const public_key &key, ge_p3 &res) {
crypto_ops::hash_to_ec(key,res);
}
/* Generate a new key pair /* Generate a new key pair
*/ */
inline secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false) { inline secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false) {

12
tests/crypto/crypto.cpp
View file

@ -33,7 +33,7 @@
#include "crypto-tests.h" #include "crypto-tests.h"
bool check_scalar(const crypto::ec_scalar &scalar) { bool check_scalar(const crypto::ec_scalar &scalar) {
return sc_check(crypto::operator &(scalar)) == 0; return crypto::sc_check(crypto::operator &(scalar)) == 0;
} }
void random_scalar(crypto::ec_scalar &res) { void random_scalar(crypto::ec_scalar &res) {
@ -45,13 +45,13 @@ void hash_to_scalar(const void *data, std::size_t length, crypto::ec_scalar &res
} }
void hash_to_point(const crypto::hash &h, crypto::ec_point &res) { void hash_to_point(const crypto::hash &h, crypto::ec_point &res) {
ge_p2 point; crypto::ge_p2 point;
ge_fromfe_frombytes_vartime(&point, reinterpret_cast<const unsigned char *>(&h)); crypto::ge_fromfe_frombytes_vartime(&point, reinterpret_cast<const unsigned char *>(&h));
ge_tobytes(crypto::operator &(res), &point); crypto::ge_tobytes(crypto::operator &(res), &point);
} }
void hash_to_ec(const crypto::public_key &key, crypto::ec_point &res) { void hash_to_ec(const crypto::public_key &key, crypto::ec_point &res) {
ge_p3 tmp; crypto::ge_p3 tmp;
crypto::hash_to_ec(key, tmp); crypto::hash_to_ec(key, tmp);
ge_p3_tobytes(crypto::operator &(res), &tmp); crypto::ge_p3_tobytes(crypto::operator &(res), &tmp);
} }