diff options
| author | stoffu <stoffu@protonmail.ch> | 2018-03-05 17:20:36 +0900 |
|---|---|---|
| committer | stoffu <stoffu@protonmail.ch> | 2018-03-14 21:00:17 +0900 |
| commit | b2d23b189efaafe89082a9f14e376c2cbad42f40 (patch) | |
| tree | 30f9dfff37773d22e2d6ccbd3803f8cae60b608e /src/crypto | |
| parent | keypair::generate: always require hw::device to avoid possible mistake (diff) | |
| download | monero-b2d23b189efaafe89082a9f14e376c2cbad42f40.tar.xz | |
crypto: revert odd namespace changes made in #3303
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/crypto.cpp | 2 | ||||
| -rw-r--r-- | src/crypto/crypto.h | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp index 0c70b9eeb..494027560 100644 --- a/src/crypto/crypto.cpp +++ b/src/crypto/crypto.cpp @@ -436,7 +436,7 @@ namespace crypto { 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; ge_p2 point; ge_p1p1 point2; diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h index 9d0e5066b..81ebfb9e2 100644 --- a/src/crypto/crypto.h +++ b/src/crypto/crypto.h @@ -46,9 +46,6 @@ #include "hex.h" #include "span.h" #include "hash.h" -extern "C" { - #include "crypto-ops.h" -} namespace crypto { @@ -116,9 +113,6 @@ namespace crypto { void operator=(const 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); 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 &); @@ -172,9 +166,6 @@ namespace crypto { 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 */ inline secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false) { |