mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

gui: Add YubiKey support to widgets

Browse source 
* Add YubiKey support to the GUI widgets.

Signed-off-by: Kyle Manna <kyle@kylemanna.com>
This commit is contained in:
Kyle Manna 2014-05-26 00:49:28 -07:00
parent 9556d8e6da
commit ba8fd25604
6 changed files with 124 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/gui/ChangeMasterKeyWidget.cpp
View file

@ -15,14 +15,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtConcurrentRun>
#include "ChangeMasterKeyWidget.h"
#include "ui_ChangeMasterKeyWidget.h"
#include "core/FilePath.h"
#include "keys/FileKey.h"
#include "keys/PasswordKey.h"
#include "keys/YkChallengeResponseKey.h"
#include "gui/FileDialog.h"
#include "gui/MessageBox.h"
#include "crypto/Random.h"
ChangeMasterKeyWidget::ChangeMasterKeyWidget(QWidget* parent)
: DialogyWidget(parent)
@ -81,6 +85,15 @@ void ChangeMasterKeyWidget::clearForms()
m_ui->togglePasswordButton->setChecked(false);
// TODO: clear m_ui->keyFileCombo
m_ui->challengeResponseGroup->setChecked(false);
m_ui->challengeResponseCombo->clear();
/* YubiKey init is slow */
connect(YubiKey::instance(), SIGNAL(detected(int,bool)),
SLOT(ykDetected(int,bool)),
Qt::QueuedConnection);
QtConcurrent::run(YubiKey::instance(), &YubiKey::detect);
m_ui->enterPasswordEdit->setFocus();
}
@ -128,6 +141,14 @@ void ChangeMasterKeyWidget::generateKey()
m_key.addKey(fileKey);
}
if (m_ui->challengeResponseGroup->isChecked()) {
int i = m_ui->challengeResponseCombo->currentIndex();
i = m_ui->challengeResponseCombo->itemData(i).toInt();
YkChallengeResponseKey key(i);
m_key.addChallengeResponseKey(key);
}
Q_EMIT editFinished(true);
}
@ -136,3 +157,11 @@ void ChangeMasterKeyWidget::reject()
{
Q_EMIT editFinished(false);
}
void ChangeMasterKeyWidget::ykDetected(int slot, bool blocking)
{
YkChallengeResponseKey yk(slot, blocking);
m_ui->challengeResponseCombo->addItem(yk.getName(), QVariant(slot));
m_ui->challengeResponseGroup->setEnabled(true);
}