Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-21 16:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable calls to missing m_cipher.isValid()

Browse Source
This commit is contained in:
denk-mal 2015-06-18 15:22:25 +02:00
parent 5b9338e40e
commit 6b7f7bb777
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/http/Protocol.cpp
View File

@ -162,7 +162,7 @@ void Request::setKey(const QString &key)
QString Request::submitUrl() const QString Request::submitUrl() const
{ {
Q_ASSERT(m_cipher.isValid()); //Q_ASSERT(m_cipher.isValid());
return decrypt(m_submitUrl, m_cipher); return decrypt(m_submitUrl, m_cipher);
} }
@ -173,7 +173,7 @@ void Request::setSubmitUrl(const QString &submitUrl)
QString Request::url() const QString Request::url() const
{ {
Q_ASSERT(m_cipher.isValid()); //Q_ASSERT(m_cipher.isValid());
return decrypt(m_url, m_cipher); return decrypt(m_url, m_cipher);
} }
@ -184,7 +184,7 @@ void Request::setUrl(const QString &url)
QString Request::realm() const QString Request::realm() const
{ {
Q_ASSERT(m_cipher.isValid()); //Q_ASSERT(m_cipher.isValid());
return decrypt(m_realm, m_cipher); return decrypt(m_realm, m_cipher);
} }
@ -195,7 +195,7 @@ void Request::setRealm(const QString &realm)
QString Request::login() const QString Request::login() const
{ {
Q_ASSERT(m_cipher.isValid()); //Q_ASSERT(m_cipher.isValid());
return decrypt(m_login, m_cipher); return decrypt(m_login, m_cipher);
} }
@ -206,7 +206,7 @@ void Request::setLogin(const QString &login)
QString Request::uuid() const QString Request::uuid() const
{ {
Q_ASSERT(m_cipher.isValid()); //Q_ASSERT(m_cipher.isValid());
return decrypt(m_uuid, m_cipher); return decrypt(m_uuid, m_cipher);
} }
@ -217,7 +217,7 @@ void Request::setUuid(const QString &uuid)
QString Request::password() const QString Request::password() const
{ {
Q_ASSERT(m_cipher.isValid()); //Q_ASSERT(m_cipher.isValid());
return decrypt(m_password, m_cipher); return decrypt(m_password, m_cipher);
} }
@ -253,7 +253,7 @@ void Request::setRequestType(const QString &requestType)
bool Request::CheckVerifier(const QString &key) const bool Request::CheckVerifier(const QString &key) const
{ {
Q_ASSERT(!m_cipher.isValid()); //Q_ASSERT(!m_cipher.isValid());
m_cipher.setKey(decode64(key)); m_cipher.setKey(decode64(key));
m_cipher.setIv(decode64(m_nonce)); m_cipher.setIv(decode64(m_nonce));
@ -292,7 +292,7 @@ Response::Response(const Request &request, QString hash):
void Response::setVerifier(QString key) void Response::setVerifier(QString key)
{ {
Q_ASSERT(!m_cipher.isValid()); //Q_ASSERT(!m_cipher.isValid());
m_cipher.setKey(decode64(key)); m_cipher.setKey(decode64(key));
@ -358,7 +358,7 @@ QVariant Response::getEntries() const
void Response::setEntries(const QList<Entry> &entries) void Response::setEntries(const QList<Entry> &entries)
{ {
Q_ASSERT(m_cipher.isValid()); //Q_ASSERT(m_cipher.isValid());
m_count = entries.count(); m_count = entries.count();