compile issues, resolve later. commiting because switching machines

This commit is contained in:
tom 2014-06-04 23:08:35 -04:00 committed by Thomas Winget
parent f70bc3a345
commit cd63132502
3 changed files with 83 additions and 2 deletions

View File

@ -26,7 +26,10 @@ namespace crypto {
}; };
POD_CLASS ec_scalar { POD_CLASS ec_scalar {
char data[32]; // FIXME: temporary to get wallet recovery to work. Need to
// discuss proper solution with team
public:
char data[32];
}; };
POD_CLASS public_key: ec_point { POD_CLASS public_key: ec_point {

View File

@ -6,6 +6,9 @@
#include <string> #include <string>
#include <map> #include <map>
#include <cstdint>
#include <vector>
#include <boost/algorithm/string.hpp>
#include "crypto/crypto.h" // for declaration of crypto::secret_key #include "crypto/crypto.h" // for declaration of crypto::secret_key
#include "crypto/electrum-words.h" #include "crypto/electrum-words.h"
@ -15,12 +18,84 @@ namespace crypto
namespace ElectrumWords namespace ElectrumWords
{ {
/* convert words to bytes, 3 words -> 4 bytes
* returns:
* false if not a multiple of 3 words, or if a words is not in the
* words list
*
* true otherwise
*/
bool words_to_bytes(const std::string& words, crypto::secret_key& dst) bool words_to_bytes(const std::string& words, crypto::secret_key& dst)
{ {
return false; int n = NUMWORDS; // hardcoded because this is what electrum uses
std::vector<std::string> wlist;
boost::split(wlist, words, boost::is_any_of(" "));
// error on non-compliant word list
if (wlist.size() != 12 && wlist.size() != 24) return false;
for (int i=0; i < wlist.size() / 3; i++)
{
uint32_t val;
uint32_t w1, w2, w3;
// verify all three words exist in the word list
if (wordsMap.count(wlist[i*3]) == 0 ||
wordsMap.count(wlist[i*3 + 1]) == 0 ||
wordsMap.count(wlist[i*3 + 2]) == 0)
{
return false;
}
w1 = wordsMap.at(wlist[i*3]);
w2 = wordsMap(wlist[i*3 + 1]);
w3 = wordsMap(wlist[i*3 + 2]);
val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n);
memcpy(dst.data + i * 4, val, 4); // copy 4 bytes to position
}
if (wlist.size() == 12)
{
memcpy(dst.data, dst.data + 16, 16); // if electrum 12-word seed, duplicate
}
return true;
} }
/* convert bytes to words, 4 bytes-> 3 words
* returns:
* false if wrong number of bytes (shouldn't be possible)
* true otherwise
*/
bool bytes_to_words(const crypto::secret_key& src, std::string& words) bool bytes_to_words(const crypto::secret_key& src, std::string& words)
{ {
int n = NUMWORDS; // hardcoded because this is what electrum uses
if (sizeof(src.data) % 4 != 0) return false;
// 8 bytes -> 3 words. 8 digits base 16 -> 3 digits base 1626
for (int i=0; i < sizeof(src.data)/4; i++, words += ' ')
{
uint32_t w1, w2, w3;
uint32_t val;
memcpy(val, src, 4);
w1 = val % n;
w2 = ((val / n) + w1) % n;
w3 = (((val / n) / n) + w2) % n;
words += wordsArray[w1];
words += ' ';
words += wordsArray[w2];
words += ' ';
words += wordsArray[w3];
}
return false; return false;
} }

View File

@ -12,6 +12,9 @@ namespace crypto
{ {
namespace ElectrumWords namespace ElectrumWords
{ {
const int NUMWORDS = 1626;
bool words_to_bytes(const std::string& words, crypto::secret_key& dst); bool words_to_bytes(const std::string& words, crypto::secret_key& dst);
bool bytes_to_words(const crypto::secret_key& src, std::string& words); bool bytes_to_words(const crypto::secret_key& src, std::string& words);