Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-21 20:49:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix wordCount instead of length

Browse source
This commit is contained in:
thez3ro 2017-03-04 22:28:41 +01:00
parent be9bd16b4c
commit 98e2c311c3
No known key found for this signature in database
GPG key ID: F628F9E41DD7C073
3 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/core/PassphraseGenerator.cpp
View file

@ -25,7 +25,7 @@
#include "core/FilePath.h"
PassphraseGenerator::PassphraseGenerator()
: m_length(0)
: m_wordCount(0)
, m_separator(' ')
{
const QString path = filePath()->dataPath("wordlists/eff_large.wordlist");
@ -40,12 +40,12 @@ double PassphraseGenerator::calculateEntropy(QString passphrase)
return 0;
}
return log(m_wordlist.size()) / log(2.0) * m_length;
return log(m_wordlist.size()) / log(2.0) * m_wordCount;
}
void PassphraseGenerator::setLength(int length)
void PassphraseGenerator::setWordCount(int wordCount)
{
m_length = length;
m_wordCount = wordCount;
}
void PassphraseGenerator::setWordlist(QString path)
@ -79,26 +79,21 @@ QString PassphraseGenerator::generatePassphrase() const
// In case there was an error loading the wordlist
if(m_wordlist.length() == 0) {
QString empty;
return empty;
return QString();
}
QString passphrase;
for (int i = 0; i < m_length; i ++) {
int word_index = randomGen()->randomUInt(m_wordlist.length());
passphrase.append(m_wordlist.at(word_index));
if(i < m_length - 1) {
passphrase.append(m_separator);
}
QStringList words;
for (int i = 0; i < m_wordCount; i++) {
int wordIndex = randomGen()->randomUInt(m_wordlist.length());
words.append(m_wordlist.at(wordIndex));
}
return passphrase;
return words.join(m_separator);
}
bool PassphraseGenerator::isValid() const
{
if (m_length == 0) {
if (m_wordCount == 0) {
return false;
}