diff options
| author | Thomas Winget <tewinget@gmail.com> | 2014-06-06 14:18:11 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2014-06-12 19:05:51 -0400 |
| commit | d22e458c6c680f4b5dcf56a58a37a5f79912e65c (patch) | |
| tree | 05a150051c892903c87d913dddf321996c035079 /src/crypto/crypto.h | |
| parent | missing '.at' on two map calls. built on some machines, very strange... (diff) | |
| download | monero-d22e458c6c680f4b5dcf56a58a37a5f79912e65c.tar.xz | |
builds, but doesn't link. other than that, electrum-style recovery implemented (but not tested\!)
Diffstat (limited to 'src/crypto/crypto.h')
| -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. |