jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Optional with QVariant

Browse Source
This commit is contained in:
Adolfo E. García
2017-10-20 16:55:02 -06:00
committed by Janek Bevendorff
parent 905e104ba2
commit 24f560aaa2
6 changed files with 54 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/totp/totp.cpp
View File

@@ -24,6 +24,7 @@
#include <QRegExp>
#include <QUrl>
#include <QUrlQuery>
#include <QVariant>
#include <QtEndian>
#include <cmath>
@@ -98,13 +99,13 @@ QString QTotp::generateTotp(const QByteArray key,
{
quint64 current = qToBigEndian(time / step);
Optional<QByteArray> secret = Base32::decode(Base32::sanitizeInput(key));
if (!secret.hasValue()) {
QVariant secret = Base32::decode(Base32::sanitizeInput(key));
if (secret.isNull()) {
return "Invalid TOTP secret key";
}
QMessageAuthenticationCode code(QCryptographicHash::Sha1);
code.setKey(secret.valueOr(""));
code.setKey(secret.toByteArray());
code.addData(QByteArray(reinterpret_cast<char*>(&current), sizeof(current)));
QByteArray hmac = code.result();