diff options
| author | monero-project <sempre.amaro@gmail.com> | 2014-06-12 19:14:25 -0400 |
|---|---|---|
| committer | monero-project <sempre.amaro@gmail.com> | 2014-06-12 19:14:25 -0400 |
| commit | c3203c86c671d41ed4a07231c8a5054124d2e7d2 (patch) | |
| tree | 06a7aceb34d1e53ca4bfd28d3fbc13b5ef0d8a30 /src/crypto/crypto.h | |
| parent | new error code for rpc (diff) | |
| parent | allow two-random-numbers wallet generation (but not as default) (diff) | |
| download | monero-c3203c86c671d41ed4a07231c8a5054124d2e7d2.tar.xz | |
Merge pull request #34 from tewinget/master
Add electrum-seed wallet backup/recovery
Diffstat (limited to '')
| -rw-r--r-- | src/crypto/crypto.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h index 61641fbcf..024713df1 100644 --- a/src/crypto/crypto.h +++ b/src/crypto/crypto.h @@ -62,8 +62,8 @@ namespace crypto { void operator=(const crypto_ops &); ~crypto_ops(); - static void generate_keys(public_key &, secret_key &); - friend void generate_keys(public_key &, secret_key &); + 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 &); friend bool check_key(const public_key &); static bool secret_key_to_public_key(const secret_key &, public_key &); @@ -102,8 +102,8 @@ namespace crypto { /* Generate a new key pair */ - inline void generate_keys(public_key &pub, secret_key &sec) { - crypto_ops::generate_keys(pub, sec); + inline secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false) { + return crypto_ops::generate_keys(pub, sec, recovery_key, recover); } /* Check a public key. Returns true if it is valid, false otherwise. |