From bb708ab8c307dfc98fbadd09c6a0ceee098e4e1b Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 22 Jun 2017 16:47:07 +0100 Subject: [PATCH] electrum-words: fix seed mistakenly thought to be old style It'd see "empty" words due to extraneous spaces --- src/mnemonics/electrum-words.cpp | 5 +++-- src/mnemonics/electrum-words.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp index ef1100a10..3b1dc53d7 100644 --- a/src/mnemonics/electrum-words.cpp +++ b/src/mnemonics/electrum-words.cpp @@ -422,10 +422,11 @@ namespace crypto * \param seed The seed to check (a space delimited concatenated word list) * \return true if the seed passed is a old style seed false if not. */ - bool get_is_old_style_seed(const std::string &seed) + bool get_is_old_style_seed(std::string seed) { std::vector word_list; - boost::split(word_list, seed, boost::is_any_of(" ")); + boost::algorithm::trim(seed); + boost::split(word_list, seed, boost::is_any_of(" "), boost::token_compress_on); return word_list.size() != (seed_length + 1); } diff --git a/src/mnemonics/electrum-words.h b/src/mnemonics/electrum-words.h index 3655dd201..94ce9c200 100644 --- a/src/mnemonics/electrum-words.h +++ b/src/mnemonics/electrum-words.h @@ -92,7 +92,7 @@ namespace crypto * \param seed The seed to check (a space delimited concatenated word list) * \return true if the seed passed is a old style seed false if not. */ - bool get_is_old_style_seed(const std::string &seed); + bool get_is_old_style_seed(std::string seed); } }