forked from dashpay/dash
-
Notifications
You must be signed in to change notification settings - Fork 720
[Core][RPC][Tests] Add HD Wallet support #956
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7173390
HD Wallet
akshaynexus e9f065e
Fix compile and some tests
akshaynexus 7aa46fc
Fix wallet_hd Tests
akshaynexus d497b3c
Use GetStrongRandBytes in CMnemonic::Generate
akshaynexus 5ca6af2
Cleanup HDChain and CHDChain set code
akshaynexus d09f053
Fix sethdchain error
akshaynexus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| /** | ||
| * Copyright (c) 2013-2014 Tomas Dzetkulic | ||
| * Copyright (c) 2013-2014 Pavol Rusnak | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining | ||
| * a copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included | ||
| * in all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
| * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES | ||
| * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
| * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| * OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| // Source: | ||
| // https://github.com/trezor/trezor-crypto | ||
|
|
||
| #include "bip39.h" | ||
| #include "bip39_english.h" | ||
| #include "crypto/sha256.h" | ||
| #include "random.h" | ||
|
|
||
| #include <openssl/evp.h> | ||
|
|
||
| SecureString CMnemonic::Generate(int strength) | ||
| { | ||
| if (strength % 32 || strength < 128 || strength > 256) { | ||
| return SecureString(); | ||
| } | ||
| SecureVector data(32); | ||
| GetStrongRandBytes(&data[0], 32); | ||
| SecureString mnemonic = FromData(data, strength / 8); | ||
| return mnemonic; | ||
| } | ||
|
|
||
| // SecureString CMnemonic::FromData(const uint8_t *data, int len) | ||
| SecureString CMnemonic::FromData(const SecureVector& data, int len) | ||
| { | ||
| if (len % 4 || len < 16 || len > 32) { | ||
| return SecureString(); | ||
| } | ||
|
|
||
| SecureVector checksum(32); | ||
| CSHA256().Write(&data[0], len).Finalize(&checksum[0]); | ||
|
|
||
| // data | ||
| SecureVector bits(len); | ||
| memcpy(&bits[0], &data[0], len); | ||
| // checksum | ||
| bits.push_back(checksum[0]); | ||
|
|
||
| int mlen = len * 3 / 4; | ||
| SecureString mnemonic; | ||
|
|
||
| int i, j, idx; | ||
| for (i = 0; i < mlen; i++) { | ||
| idx = 0; | ||
| for (j = 0; j < 11; j++) { | ||
| idx <<= 1; | ||
| idx += (bits[(i * 11 + j) / 8] & (1 << (7 - ((i * 11 + j) % 8)))) > 0; | ||
| } | ||
| mnemonic.append(wordlist[idx]); | ||
| if (i < mlen - 1) { | ||
| mnemonic += ' '; | ||
| } | ||
| } | ||
|
|
||
| return mnemonic; | ||
| } | ||
|
|
||
| bool CMnemonic::Check(SecureString mnemonic) | ||
| { | ||
| if (mnemonic.empty()) { | ||
| return false; | ||
| } | ||
|
|
||
| uint32_t nWordCount{}; | ||
|
|
||
| for (size_t i = 0; i < mnemonic.size(); ++i) { | ||
| if (mnemonic[i] == ' ') { | ||
| nWordCount++; | ||
| } | ||
| } | ||
| nWordCount++; | ||
| // check number of words | ||
| if (nWordCount != 12 && nWordCount != 18 && nWordCount != 24) { | ||
| return false; | ||
| } | ||
|
|
||
| SecureString ssCurrentWord; | ||
| SecureVector bits(32 + 1); | ||
|
|
||
| uint32_t nWordIndex, ki, nBitsCount{}; | ||
|
|
||
| for (size_t i = 0; i < mnemonic.size(); ++i) | ||
| { | ||
| ssCurrentWord = ""; | ||
| while (i + ssCurrentWord.size() < mnemonic.size() && mnemonic[i + ssCurrentWord.size()] != ' ') { | ||
| if (ssCurrentWord.size() >= 9) { | ||
| return false; | ||
| } | ||
| ssCurrentWord += mnemonic[i + ssCurrentWord.size()]; | ||
| } | ||
| i += ssCurrentWord.size(); | ||
| nWordIndex = 0; | ||
| for (;;) { | ||
| if (!wordlist[nWordIndex]) { // word not found | ||
| return false; | ||
| } | ||
| if (ssCurrentWord == wordlist[nWordIndex]) { // word found on index nWordIndex | ||
| for (ki = 0; ki < 11; ki++) { | ||
| if (nWordIndex & (1 << (10 - ki))) { | ||
| bits[nBitsCount / 8] |= 1 << (7 - (nBitsCount % 8)); | ||
| } | ||
| nBitsCount++; | ||
| } | ||
| break; | ||
| } | ||
| nWordIndex++; | ||
| } | ||
| } | ||
| if (nBitsCount != nWordCount * 11) { | ||
| return false; | ||
| } | ||
| bits[32] = bits[nWordCount * 4 / 3]; | ||
| CSHA256().Write(&bits[0], nWordCount * 4 / 3).Finalize(&bits[0]); | ||
|
|
||
| bool fResult = 0; | ||
| if (nWordCount == 12) { | ||
| fResult = (bits[0] & 0xF0) == (bits[32] & 0xF0); // compare first 4 bits | ||
| } else | ||
| if (nWordCount == 18) { | ||
| fResult = (bits[0] & 0xFC) == (bits[32] & 0xFC); // compare first 6 bits | ||
| } else | ||
| if (nWordCount == 24) { | ||
| fResult = bits[0] == bits[32]; // compare 8 bits | ||
| } | ||
|
|
||
| return fResult; | ||
| } | ||
|
|
||
| // passphrase must be at most 256 characters or code may crash | ||
| void CMnemonic::ToSeed(SecureString mnemonic, SecureString passphrase, SecureVector& seedRet) | ||
| { | ||
| SecureString ssSalt = SecureString("mnemonic") + passphrase; | ||
| SecureVector vchSalt(ssSalt.begin(), ssSalt.end()); | ||
| seedRet.resize(64); | ||
| // int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, | ||
| // const unsigned char *salt, int saltlen, int iter, | ||
| // const EVP_MD *digest, | ||
| // int keylen, unsigned char *out); | ||
| PKCS5_PBKDF2_HMAC(mnemonic.c_str(), mnemonic.size(), &vchSalt[0], vchSalt.size(), 2048, EVP_sha512(), 64, &seedRet[0]); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /** | ||
| * Copyright (c) 2013-2014 Tomas Dzetkulic | ||
| * Copyright (c) 2013-2014 Pavol Rusnak | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining | ||
| * a copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included | ||
| * in all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
| * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES | ||
| * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
| * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| * OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #ifndef PIVX_BIP39_H | ||
| #define PIVX_BIP39_H | ||
|
|
||
| #include "allocators.h" | ||
|
|
||
| class CMnemonic | ||
| { | ||
| public: | ||
| static SecureString Generate(int strength); // strength in bits | ||
| static SecureString FromData(const SecureVector& data, int len); | ||
| static bool Check(SecureString mnemonic); | ||
| // passphrase must be at most 256 characters or code may crash | ||
| static void ToSeed(SecureString mnemonic, SecureString passphrase, SecureVector& seedRet); | ||
| }; | ||
|
|
||
| #endif |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This files was deprecated (the whole trezor repository was) and there is an open discussion about
PBKDF2weakness.Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unless im wrong,i dont see the whole repo being depricated,more so they moved to a new repo.Since i didnt see deprication mentioned anywhere on their repo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Checked their new repo,it uses mostly the same code in bip39 if im not mistaken,but in c.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the repository was moved to other place, not updated anymore, and the code was ported to another language plus some changes were done. Then the code is deprecated. The "mostly the same code" in this key creation code is not enough.
If we are going to back port code from other place, we need to ensure that it's the latest one to not end up having problems that were already solved in other place.
Sorry if I sound hard but this piece of code is in charge of the master key creation, we must go secure in this area.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These were the changes,What they (trezor) have done is move those files to a new repo and refactored bip39 code,other than that i dont see any changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is important is what it's inside of those commits and where they moved from cpp to c code (what changes they did there and how that changes this code -- if it changes it or not.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that there is no previous history. Instead of refactor the file name, they created this .c as a new one.