Merge branch 'develop' into feature/yubikey

This commit is contained in:
Janek Bevendorff 2017-01-15 03:20:21 +02:00 committed by GitHub
commit e17576a6f7
30 changed files with 314 additions and 126 deletions

View file

@ -301,7 +301,7 @@ bool KeePass2Reader::readHeaderField()
break;
case KeePass2::TransformRounds:
setTansformRounds(fieldData);
setTransformRounds(fieldData);
break;
case KeePass2::EncryptionIV:
@ -382,7 +382,7 @@ void KeePass2Reader::setTransformSeed(const QByteArray& data)
}
}
void KeePass2Reader::setTansformRounds(const QByteArray& data)
void KeePass2Reader::setTransformRounds(const QByteArray& data)
{
if (data.size() != 8) {
raiseError("Invalid transform rounds size");