Variable unique prefix lengths for seed

This commit is contained in:
Oran Juice 2014-10-07 12:49:36 +05:30
parent 2c739371ac
commit 9875f5b875
No known key found for this signature in database
GPG key ID: 71C5AF46CCB28124
7 changed files with 46 additions and 47 deletions

View file

@ -59,6 +59,8 @@
#include "language_base.h" #include "language_base.h"
#include "singleton.h" #include "singleton.h"
#include <iostream>
namespace namespace
{ {
const int seed_length = 24; const int seed_length = 24;
@ -69,11 +71,11 @@ namespace
* \param seed List of words to match. * \param seed List of words to match.
* \param has_checksum If word list passed checksum test, we need to only do a prefix check. * \param has_checksum If word list passed checksum test, we need to only do a prefix check.
* \param matched_indices The indices where the seed words were found are added to this. * \param matched_indices The indices where the seed words were found are added to this.
* \param language Language instance pointer to write to after it is found.
* \return true if all the words were present in some language false if not. * \return true if all the words were present in some language false if not.
*/ */
bool find_seed_language(const std::vector<std::string> &seed, bool find_seed_language(const std::vector<std::string> &seed,
bool has_checksum, std::vector<uint32_t> &matched_indices, uint32_t &word_list_length, bool has_checksum, std::vector<uint32_t> &matched_indices, Language::Base **language)
std::string &language_name)
{ {
// If there's a new language added, add an instance of it here. // If there's a new language added, add an instance of it here.
std::vector<Language::Base*> language_instances({ std::vector<Language::Base*> language_instances({
@ -83,18 +85,6 @@ namespace
Language::Singleton<Language::Japanese>::instance(), Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::OldEnglish>::instance() Language::Singleton<Language::OldEnglish>::instance()
}); });
// To hold trimmed seed words in case of a checksum being present.
std::vector<std::string> trimmed_seed;
if (has_checksum)
{
// If it had a checksum, we'll just compare the unique prefix
// So we create a list of trimmed seed words
for (std::vector<std::string>::const_iterator it = seed.begin(); it != seed.end(); it++)
{
trimmed_seed.push_back(it->length() > Language::unique_prefix_length ?
it->substr(0, Language::unique_prefix_length) : *it);
}
}
// Iterate through all the languages and find a match // Iterate through all the languages and find a match
for (std::vector<Language::Base*>::iterator it1 = language_instances.begin(); for (std::vector<Language::Base*>::iterator it1 = language_instances.begin();
@ -104,23 +94,22 @@ namespace
const std::unordered_map<std::string, uint32_t> &trimmed_word_map = (*it1)->get_trimmed_word_map(); const std::unordered_map<std::string, uint32_t> &trimmed_word_map = (*it1)->get_trimmed_word_map();
// To iterate through seed words // To iterate through seed words
std::vector<std::string>::const_iterator it2; std::vector<std::string>::const_iterator it2;
// To iterate through trimmed seed words
std::vector<std::string>::iterator it3;
bool full_match = true; bool full_match = true;
std::string trimmed_word;
// Iterate through all the words and see if they're all present // Iterate through all the words and see if they're all present
for (it2 = seed.begin(), it3 = trimmed_seed.begin(); for (it2 = seed.begin(); it2 != seed.end(); it2++)
it2 != seed.end(); it2++, it3++)
{ {
if (has_checksum) if (has_checksum)
{ {
trimmed_word = it2->substr(0, (*it1)->get_unique_prefix_length());
// Use the trimmed words and map // Use the trimmed words and map
if (trimmed_word_map.count(*it3) == 0) if (trimmed_word_map.count(trimmed_word) == 0)
{ {
full_match = false; full_match = false;
break; break;
} }
matched_indices.push_back(trimmed_word_map.at(*it3)); matched_indices.push_back(trimmed_word_map.at(trimmed_word));
} }
else else
{ {
@ -134,8 +123,7 @@ namespace
} }
if (full_match) if (full_match)
{ {
word_list_length = (*it1)->get_word_list().size(); *language = *it1;
language_name = (*it1)->get_language_name();
return true; return true;
} }
// Some didn't match. Clear the index array. // Some didn't match. Clear the index array.
@ -146,18 +134,20 @@ namespace
/*! /*!
* \brief Creates a checksum index in the word list array on the list of words. * \brief Creates a checksum index in the word list array on the list of words.
* \param word_list Vector of words * \param word_list Vector of words
* \return Checksum index * \param unique_prefix_length the prefix length of each word to use for checksum
* \return Checksum index
*/ */
uint32_t create_checksum_index(const std::vector<std::string> &word_list) uint32_t create_checksum_index(const std::vector<std::string> &word_list,
uint32_t unique_prefix_length)
{ {
std::string trimmed_words = ""; std::string trimmed_words = "";
for (std::vector<std::string>::const_iterator it = word_list.begin(); it != word_list.end(); it++) for (std::vector<std::string>::const_iterator it = word_list.begin(); it != word_list.end(); it++)
{ {
if (it->length() > 4) if (it->length() > unique_prefix_length)
{ {
trimmed_words += it->substr(0, Language::unique_prefix_length); trimmed_words += it->substr(0, unique_prefix_length);
} }
else else
{ {
@ -171,20 +161,21 @@ namespace
/*! /*!
* \brief Does the checksum test on the seed passed. * \brief Does the checksum test on the seed passed.
* \param seed Vector of seed words * \param seed Vector of seed words
* \return True if the test passed false if not. * \param unique_prefix_length the prefix length of each word to use for checksum
* \return True if the test passed false if not.
*/ */
bool checksum_test(std::vector<std::string> seed) bool checksum_test(std::vector<std::string> seed, uint32_t unique_prefix_length)
{ {
// The last word is the checksum. // The last word is the checksum.
std::string last_word = seed.back(); std::string last_word = seed.back();
seed.pop_back(); seed.pop_back();
std::string checksum = seed[create_checksum_index(seed)]; std::string checksum = seed[create_checksum_index(seed, unique_prefix_length)];
std::string trimmed_checksum = checksum.length() > 4 ? checksum.substr(0, Language::unique_prefix_length) : std::string trimmed_checksum = checksum.length() > unique_prefix_length ? checksum.substr(0, unique_prefix_length) :
checksum; checksum;
std::string trimmed_last_word = checksum.length() > 4 ? last_word.substr(0, Language::unique_prefix_length) : std::string trimmed_last_word = last_word.length() > unique_prefix_length ? last_word.substr(0, unique_prefix_length) :
last_word; last_word;
return trimmed_checksum == trimmed_last_word; return trimmed_checksum == trimmed_last_word;
} }
@ -227,9 +218,19 @@ namespace crypto
// If it is seed with a checksum. // If it is seed with a checksum.
bool has_checksum = seed.size() == (seed_length + 1); bool has_checksum = seed.size() == (seed_length + 1);
std::vector<uint32_t> matched_indices;
Language::Base *language;
if (!find_seed_language(seed, has_checksum, matched_indices, &language))
{
return false;
}
language_name = language->get_language_name();
uint32_t word_list_length = language->get_word_list().size();
if (has_checksum) if (has_checksum)
{ {
if (!checksum_test(seed)) if (!checksum_test(seed, language->get_unique_prefix_length()))
{ {
// Checksum fail // Checksum fail
return false; return false;
@ -237,13 +238,6 @@ namespace crypto
seed.pop_back(); seed.pop_back();
} }
std::vector<uint32_t> matched_indices;
uint32_t word_list_length = 0;
if (!find_seed_language(seed, has_checksum, matched_indices, word_list_length, language_name))
{
return false;
}
for (unsigned int i=0; i < seed.size() / 3; i++) for (unsigned int i=0; i < seed.size() / 3; i++)
{ {
uint32_t val; uint32_t val;
@ -335,7 +329,7 @@ namespace crypto
} }
words.pop_back(); words.pop_back();
words += (' ' + words_store[create_checksum_index(words_store)]); words += (' ' + words_store[create_checksum_index(words_store, language->get_unique_prefix_length())]);
return false; return false;
} }

View file

@ -1681,6 +1681,7 @@ namespace Language
"zones", "zones",
"zoom" "zoom"
}); });
unique_prefix_length = 3;
word_map = new std::unordered_map<std::string, uint32_t>; word_map = new std::unordered_map<std::string, uint32_t>;
trimmed_word_map = new std::unordered_map<std::string, uint32_t>; trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
language_name = "English"; language_name = "English";

View file

@ -1681,6 +1681,7 @@ namespace Language
"びじゅつかん", "びじゅつかん",
"ひしょ" "ひしょ"
}); });
unique_prefix_length = 4;
word_map = new std::unordered_map<std::string, uint32_t>; word_map = new std::unordered_map<std::string, uint32_t>;
trimmed_word_map = new std::unordered_map<std::string, uint32_t>; trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
language_name = "Japanese"; language_name = "Japanese";

View file

@ -45,7 +45,6 @@
*/ */
namespace Language namespace Language
{ {
const int unique_prefix_length = 4; /*!< Length of the prefix of all words guaranteed to be unique */
/*! /*!
* \class Base * \class Base
* \brief A base language class which all languages have to inherit from for * \brief A base language class which all languages have to inherit from for
@ -58,7 +57,7 @@ namespace Language
std::unordered_map<std::string, uint32_t> *word_map; /*!< hash table to find word's index */ std::unordered_map<std::string, uint32_t> *word_map; /*!< hash table to find word's index */
std::unordered_map<std::string, uint32_t> *trimmed_word_map; /*!< hash table to find word's trimmed index */ std::unordered_map<std::string, uint32_t> *trimmed_word_map; /*!< hash table to find word's trimmed index */
std::string language_name; /*!< Name of language */ std::string language_name; /*!< Name of language */
int trim_length; /*!< Number of unique starting characters to trim the wordlist to when matching */ uint32_t unique_prefix_length; /*!< Number of unique starting characters to trim the wordlist to when matching */
/*! /*!
* \brief Populates the word maps after the list is ready. * \brief Populates the word maps after the list is ready.
*/ */
@ -85,6 +84,7 @@ namespace Language
word_list = new std::vector<std::string>; word_list = new std::vector<std::string>;
word_map = new std::unordered_map<std::string, uint32_t>; word_map = new std::unordered_map<std::string, uint32_t>;
trimmed_word_map = new std::unordered_map<std::string, uint32_t>; trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
unique_prefix_length = 4;
} }
/*! /*!
* \brief Returns a pointer to the word list. * \brief Returns a pointer to the word list.
@ -122,9 +122,9 @@ namespace Language
* \brief Returns the number of unique starting characters to be used for matching. * \brief Returns the number of unique starting characters to be used for matching.
* \return Number of unique starting characters. * \return Number of unique starting characters.
*/ */
int get_trim_length() const uint32_t get_unique_prefix_length() const
{ {
return trim_length; return unique_prefix_length;
} }
}; };
} }

View file

@ -1681,6 +1681,7 @@ namespace Language
"weapon", "weapon",
"weary" "weary"
}); });
unique_prefix_length = 4;
word_map = new std::unordered_map<std::string, uint32_t>; word_map = new std::unordered_map<std::string, uint32_t>;
trimmed_word_map = new std::unordered_map<std::string, uint32_t>; trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
language_name = "OldEnglish"; language_name = "OldEnglish";

View file

@ -1679,6 +1679,7 @@ namespace Language
"zenite", "zenite",
"zumbi" "zumbi"
}); });
unique_prefix_length = 4;
word_map = new std::unordered_map<std::string, uint32_t>; word_map = new std::unordered_map<std::string, uint32_t>;
trimmed_word_map = new std::unordered_map<std::string, uint32_t>; trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
language_name = "Portuguese"; language_name = "Portuguese";

View file

@ -1681,6 +1681,7 @@ namespace Language
"ritmo", "ritmo",
"rito" "rito"
}); });
unique_prefix_length = 4;
word_map = new std::unordered_map<std::string, uint32_t>; word_map = new std::unordered_map<std::string, uint32_t>;
trimmed_word_map = new std::unordered_map<std::string, uint32_t>; trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
language_name = "Spanish"; language_name = "Spanish";