Commit 36fae15a authored by Klas Lindfors's avatar Klas Lindfors

Imported Upstream version 3.1.1

parent 35a054dc
......@@ -8,3 +8,7 @@ deps/
libs/
object_script.yubikey-personalization-gui.Debug
object_script.yubikey-personalization-gui.Release
.*.swp
yubikey-personalization-gui-*.tar.gz
yubikey-personalization-gui-*.tar.gz.sig
.DS_Store
2012-10-17 Klas Lindfors <klas@yubico.com>
* NEWS: add NEWS and release date for 3.1.1
2012-10-15 Klas Lindfors <klas@yubico.com>
* src/ui/scanedit.cpp: don't try to access the usb2key arrays if the
scancode is to high
2012-10-15 Klas Lindfors <klas@yubico.com>
* src/ui/staticpage.cpp: take the scancodes directly from the
scancode field, it's always populated
2012-10-12 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: do else:fedora to avoid debian branch
falling into later else
2012-10-12 Klas Lindfors <klas@yubico.com>
* src/ui/staticpage.cpp: set scancodes to password mode when hidden
2012-10-12 Klas Lindfors <klas@yubico.com>
* src/ui/staticpage.cpp: set len to zero when clearing
2012-10-12 Klas Lindfors <klas@yubico.com>
* src/ui/staticpage.cpp, src/ui/staticpage.h: capture a pressed
return when editing text
2012-10-12 Klas Lindfors <klas@yubico.com>
* installer/win-nsis/ykpers.nsi: don't show the components at all as
we only have one
2012-10-12 Klas Lindfors <klas@yubico.com>
* : commit 791a91cfffaded71855c788ae1932e5881f9da5c Author: Klas
Lindfors <klas@yubico.com> Date: Fri Oct 12 08:36:48 2012 +0200
2012-10-11 Maxim Burgerhout <maxim@wzzrd.com>
* resources/lin/yubikey-personalization-gui.desktop,
resources/lin/yubikey-personalization-gui.xpm: Add .desktop, .xpm
and .png files These are from the yubikey-personalization-gui-dpkg repo on github.
Putting them here will enable us to grab them from the tarball in
the future, instead of directly from github.
2012-10-11 Maxim Burgerhout <maxim@wzzrd.com>
* YKPersonalization.pro: Linux build -> Generic Linux build
2012-10-11 Maxim Burgerhout <maxim@wzzrd.com>
* YKPersonalization.pro: Create a separate 'fedora' build target Copying this from the 'debian' target to make sure changes there
will not bite us, and vice versa.
2012-10-11 Klas Lindfors <klas@yubico.com>
* src/ui/chalresppage.ui, src/ui/oathpage.ui, src/ui/otppage.ui,
src/ui/settingpage.ui, src/ui/staticpage.ui, src/ui/toolpage.ui:
change height of radio buttons so whole button can be seen
2012-10-11 Klas Lindfors <klas@yubico.com>
* src/ui/settingpage.cpp, src/ui/settingpage.ui: use validators
instead of inputmask for all customer prefix fields
2012-10-11 Klas Lindfors <klas@yubico.com>
* src/ui/scanedit.cpp, src/ui/scanedit.h, src/ui/staticpage.cpp,
src/ui/staticpage.h, src/ui/staticpage.ui: rework the scancode
input. allow editing and pasting, allow going back and forth between scan
codes and text.
2012-10-10 Klas Lindfors <klas@yubico.com>
* src/ui/staticpage.cpp, src/ui/staticpage.h, src/ui/staticpage.ui:
add field for scan code input allowing either direct input as scan codes also showing the
scancodes that will be programmed for standard text
2012-10-10 Klas Lindfors <klas@yubico.com>
* src/yubikeyfinder.cpp: clear the struct when no key found, not
when closing. when closing, clear m_yk
2012-10-10 Klas Lindfors <klas@yubico.com>
* src/yubikeyfinder.cpp: always closeKey() when we're done with it
in yubikeyfinder
2012-10-10 Klas Lindfors <klas@yubico.com>
* src/yubikeyfinder.cpp, src/yubikeywriter.cpp: only do yk_init() /
yk_release() in constructor/destructor of yubikeyfinder
2012-10-08 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: change name of linux installer
2012-10-08 Klas Lindfors <klas@yubico.com>
* : commit a5339e308fc784cf6a996c8050a81bcf9e6abda9 Merge: 27b8dac
88ba617 Author: Klas Lindfors <klas@yubico.com> Date: Mon Oct 8
11:00:57 2012 +0200
2012-10-08 Klas Lindfors <klas@yubico.com>
* resources/lin/YubiKey Personalization Tool.sh: fix binary name
2012-10-08 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: fix search paths for linux "installer"
2012-10-08 Klas Lindfors <klas@yubico.com>
* : commit a79a710011ebddc22fbab5477cc6b4b4a452cc54 Author: Klas
Lindfors <klas@yubico.com> Date: Mon Oct 8 09:30:45 2012 +0100
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: other libdir for natively installed qt..
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro, resources/mac/installer.plist: installer
fixups
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: remove the headers from qt frameworks
2012-10-04 Klas Lindfors <klas@yubico.com>
* .gitignore: add .DS_Store to .gitignore
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: run install_name_tool for native builds
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: use codesign and pkgbuild to build a signed
installer
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: fix installer name for native mac build
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: native mac build fixes
2012-10-04 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: declare that we need qgif
2012-10-03 Klas Lindfors <klas@yubico.com>
* .gitignore: ignore build artifacts and .swp files
2012-10-03 Klas Lindfors <klas@yubico.com>
* : commit c373d05f7fb586c4810941eaa8cee32af2e30841 Author: Klas
Lindfors <klas@yubico.com> Date: Wed Oct 3 10:05:31 2012 +0200
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/yubikeylogger.cpp: spelling timstamp -> timestamp
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/yubikeylogger.cpp: do start logging in traditional format
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/common.h, src/ui/settingpage.cpp, src/ui/settingpage.ui: add
controls for the logging format
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/yubikeylogger.cpp: implement the yubico logging format
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/yubikeylogger.cpp: spelling timstamp -> timestamp
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/yubikeylogger.cpp: do start logging in traditional format
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/ui/settingpage.cpp: set logging format on load
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/common.h, src/ui/settingpage.cpp, src/ui/settingpage.ui: add
controls for the logging format
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/yubikeylogger.cpp, src/yubikeylogger.h: add support for
different formats to logger
2012-10-03 Klas Lindfors <klas@yubico.com>
* src/ui/chalresppage.cpp, src/ui/oathpage.cpp, src/ui/otppage.cpp,
src/ui/settingpage.cpp, src/ui/staticpage.cpp,
src/yubikeyconfig.cpp, src/yubikeyconfig.h: add serial to
yubikeyconfig class
2012-10-01 Klas Lindfors <klas@yubico.com>
* src/ui/mainwindow.cpp, src/ui/mainwindow.ui,
src/yubikeyfinder.cpp, src/yubikeyfinder.h: use touchLevel to find
out what slots on inserted YubiKey is programmed
2012-10-01 Klas Lindfors <klas@yubico.com>
* NEWS, YKPersonalization.pro, src/version.h: bump versions after
release
2012-09-28 Klas Lindfors <klas@yubico.com>
* NEWS, YKPersonalization.pro, src/version.h: bump versions for
......
yubikey-personalization-gui NEWS -- History of user-visible changes. -*- outline -*-
* Version 3.1.1 (released 2012-10-17)
** For native mac builds, sign and use pkgbuilder to create pkg installer.
** Add logging format "Yubico" that corresponds to other tools.
** Show which slots of a key contain valid configuration.
** Refactor scancode input for static keys, now allows editing, pasting and
entering raw scancodes.
** When scanning if the key is present, keep it open for as short as possible,
should increase possibility for other concurrent accesses.
* Version 3.1.0 (released 2012-09-28)
** Support for features in YubiKey 2.3.
......
#
# global definitions
#
VERSION = "3.1.0"
VERSION = "3.1.1"
APP_NAME = $$quote(YubiKey Personalization Tool)
#
# common configuration
#
QT += core gui
DEPLOYMENT_PLUGIN += qgif
TEMPLATE = app
TARGET = yubikey-personalization-gui
......@@ -93,7 +94,7 @@ OTHER_FILES += \
resources/mac/Info.plist.in \
resources/mac/qt.conf
!debian {
!debian:!fedora {
HEADERS += \
deps/libykpers/ykpers.h \
deps/libykpers/ykpbkdf2.h \
......@@ -200,7 +201,7 @@ win32 {
#
# Non-windows specific configuration
#
!win32:!debian {
!win32:!debian:!fedora {
SOURCES += \
deps/libykpers/ykpers.c \
deps/libykpers/ykpbkdf2.c \
......@@ -233,8 +234,19 @@ unix:!macx {
QMAKE_CXXFLAGS += $$(CXXFLAGS)
QMAKE_LFLAGS += $$(LDFLAGS)
} else:fedora {
message("Fedora build")
LIBS += -lyubikey
CONFIG += link_pkgconfig
PKGCONFIG += ykpers-1
QMAKE_CXXFLAGS += $$(CXXFLAGS)
QMAKE_LFLAGS += $$(LDFLAGS)
} else {
message("Linux build")
message("Generic Linux build")
HEADERS += deps/libusb-1.0/libusb.h
SOURCES += deps/libykpers/ykcore/ykcore_libusb-1.0.c
......@@ -247,8 +259,9 @@ unix:!macx {
# Copy dependencies and other resources
LIB_FILES += \
$(QTDIR)/lib/libQtGui.so.4 \
$(QTDIR)/lib/libQtCore.so.4 \
$$[QT_INSTALL_LIBS]/libQtGui.so.4 \
$$[QT_INSTALL_LIBS]/libQtCore.so.4 \
$$[QT_INSTALL_PLUGINS]/imageformats/libqgif.so \
libs/lin/libusb-1.0.so.0 \
resources/lin/$${TARGET_LIN}.sh
......@@ -257,8 +270,8 @@ unix:!macx {
}
# Create application tarball
TARROOT = Yubico
TARFILE = "$${TARGET_LIN}\\ Installer-lin.tgz"
TARROOT = "$${TARGET_LIN}-linux-$${VERSION}"
TARFILE = "$${TARGET_LIN}-linux-$${VERSION}.tgz"
tarball.target = tarball
tarball.commands = \
......@@ -292,12 +305,17 @@ macx {
# FIXME: this is prone to breaking with version numbers
INCLUDEPATH += $$(OSX_SDK)/usr/include/c++/4.2.1
}
}
QMAKE_CFLAGS_X86_64 -= -arch
QMAKE_CFLAGS_X86_64 -= x86_64
QMAKE_CXXFLAGS_X86_64 -= -arch
QMAKE_CXXFLAGS_X86_64 -= x86_64
} else {
_QT_LIBDIR = $$QMAKE_LIBDIR_QT
_QT_PLUGINDIR = $$[QT_INSTALL_PLUGINS]
QMAKE_CFLAGS_X86_64 -= -arch
QMAKE_CFLAGS_X86_64 -= x86_64
QMAKE_CXXFLAGS_X86_64 -= -arch
QMAKE_CXXFLAGS_X86_64 -= x86_64
isEmpty(PACKAGE_SIGN_IDENTITY):PACKAGE_SIGN_IDENTITY = 'Developer ID Application'
isEmpty(INSTALLER_SIGN_IDENTITY):INSTALLER_SIGN_IDENTITY = 'Developer ID Installer'
}
# The application dependencies
LIBS += $$_SDK/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
......@@ -319,30 +337,37 @@ macx {
sed -e \'s|@@version@@|$$VERSION|g\' \
< resources/mac/Info.plist.in > $${DESTDIR}/$${TARGET_MAC}.app/Contents/Info.plist)
cross {
# copy the QT libraries into our bundle
_BASEDIR = $${DESTDIR}/$${TARGET_MAC}.app/Contents
_FRAMEWORKDIR = $${_BASEDIR}/Frameworks
_PLUGINDIR = $${_BASEDIR}/PlugIns
QMAKE_POST_LINK += $$quote( && mkdir -p $$_FRAMEWORKDIR && \
cp -R $$_QT_LIBDIR/QtCore.framework $$_FRAMEWORKDIR/QtCore.framework && \
cp -R $$_QT_LIBDIR/QtGui.framework $$_FRAMEWORKDIR/QtGui.framework && \
find $$_FRAMEWORKDIR -type l -print0 | xargs -0 rm -f && \
mv $$_FRAMEWORKDIR/QtGui.framework/Versions/4/Resources/qt_menu.nib $$_BASEDIR/Resources/qt_menu.nib && \
rmdir $$_FRAMEWORKDIR/QtGui.framework/Versions/4/Resources && \
mkdir -p $$_PLUGINDIR/imageformats && \
cp -R $$_QT_PLUGINDIR/imageformats/libqgif.dylib $$_PLUGINDIR/imageformats)
# fixup all library paths..
_BASE = $$quote(@executable_path/../Frameworks)
_QTCORE = $$quote(QtCore.framework/Versions/4/QtCore)
_QTGUI = $$quote(QtGui.framework/Versions/4/QtGui)
QMAKE_POST_LINK += $$quote( && $$(TARGET_ARCH)-install_name_tool -change $$_QTCORE $$_BASE/$$_QTCORE $$_BASEDIR/MacOS/$$TARGET_MAC && \
$$(TARGET_ARCH)-install_name_tool -change $$_QTGUI $$_BASE/$$_QTGUI $$_BASEDIR/MacOS/$$TARGET_MAC && \
$$(TARGET_ARCH)-install_name_tool -change $$_QTCORE $$_BASE/$$_QTCORE $$_FRAMEWORKDIR/$$_QTGUI && \
$$(TARGET_ARCH)-install_name_tool -change $$_QTCORE $$_BASE/$$_QTCORE $$_PLUGINDIR/imageformats/libqgif.dylib && \
$$(TARGET_ARCH)-install_name_tool -change $$_QTGUI $$_BASE/$$_QTGUI $$_PLUGINDIR/imageformats/libqgif.dylib)
# copy the QT libraries into our bundle
_BASEDIR = $${DESTDIR}/$${TARGET_MAC}.app/Contents
_FRAMEWORKDIR = $${_BASEDIR}/Frameworks
_PLUGINDIR = $${_BASEDIR}/PlugIns
QMAKE_POST_LINK += $$quote( && mkdir -p $$_FRAMEWORKDIR && \
cp -R $$_QT_LIBDIR/QtCore.framework $$_FRAMEWORKDIR/QtCore.framework && \
rm -rf $$_FRAMEWORKDIR/QtCore.framework/Versions/4/Headers && \
cp -R $$_QT_LIBDIR/QtGui.framework $$_FRAMEWORKDIR/QtGui.framework && \
rm -rf $$_FRAMEWORKDIR/QtGui.framework/Versions/4/Headers && \
find $$_FRAMEWORKDIR -type l -print0 | xargs -0 rm -f && \
mv $$_FRAMEWORKDIR/QtGui.framework/Versions/4/Resources/qt_menu.nib $$_BASEDIR/Resources/qt_menu.nib && \
rmdir $$_FRAMEWORKDIR/QtGui.framework/Versions/4/Resources && \
mkdir -p $$_PLUGINDIR/imageformats && \
cp -R $$_QT_PLUGINDIR/imageformats/libqgif.dylib $$_PLUGINDIR/imageformats)
# fixup all library paths..
_BASE = $$quote(@executable_path/../Frameworks)
_QTCORE = $$quote(QtCore.framework/Versions/4/QtCore)
_QTGUI = $$quote(QtGui.framework/Versions/4/QtGui)
isEmpty($$_TARGET_ARCH) {
_INSTALL_NAME_TOOL = install_name_tool
} else {
_INSTALL_NAME_TOOL = $$(TARGET_ARCH)-install_name_tool
}
QMAKE_POST_LINK += $$quote( && $$_INSTALL_NAME_TOOL -change $$_QTCORE $$_BASE/$$_QTCORE $$_BASEDIR/MacOS/$$TARGET_MAC && \
$$_INSTALL_NAME_TOOL -change $$_QTGUI $$_BASE/$$_QTGUI $$_BASEDIR/MacOS/$$TARGET_MAC && \
$$_INSTALL_NAME_TOOL -change $$_QTCORE $$_BASE/$$_QTCORE $$_FRAMEWORKDIR/$$_QTGUI && \
$$_INSTALL_NAME_TOOL -change $$_QTCORE $$_BASE/$$_QTCORE $$_PLUGINDIR/imageformats/libqgif.dylib && \
$$_INSTALL_NAME_TOOL -change $$_QTGUI $$_BASE/$$_QTGUI $$_PLUGINDIR/imageformats/libqgif.dylib)
cross {
build_installer {
QMAKE_POST_LINK += $$quote( && mkdir -p $${DESTDIR}/temp/ && \
cp -R $${DESTDIR}/$${TARGET_MAC}.app $${DESTDIR}/temp/ && \
......@@ -354,9 +379,17 @@ macx {
dmg dmg $${DESTDIR}/ykpers-pre.dmg $${DESTDIR}/$${TARGET_MAC}-$${VERSION}.dmg)
}
} else {
build_installer {
QMAKE_POST_LINK += $$quote( && codesign -s \'$$PACKAGE_SIGN_IDENTITY\' $${DESTDIR}/$${TARGET_MAC}.app && \
rm -rf $${DESTDIR}/temp && \
mkdir -p $${DESTDIR}/temp/ && \
cp -R $${DESTDIR}/$${TARGET_MAC}.app $${DESTDIR}/temp/ && \
pkgbuild --sign \'$$INSTALLER_SIGN_IDENTITY\' --version $${VERSION} --root $${DESTDIR}/temp/ --component-plist resources/mac/installer.plist --install-location '/Applications/' $${DESTDIR}/$${TARGET_MAC}-$${VERSION}.pkg)
}
# Create application dmg
shutup = ">/dev/null 2>&1"
isEmpty(MACDEPLOYQT):MACDEPLOYQT = macdeployqt
!system($$MACDEPLOYQT $$shutup) {
warning("macdeployqt utility '$$MACDEPLOYQT' not found \
......@@ -378,7 +411,7 @@ macx {
} else {
contains(QMAKE_EXTRA_TARGETS, macdeploy) {
IMAGEROOT = $${DESTDIR}/disk-image-root
IMAGEFILE = $${DESTDIR}/$${TARGET_MAC}\\ Installer-mac.dmg
IMAGEFILE = $${DESTDIR}/$${TARGET_MAC}-$${VERSION}.dmg
#Note: Volume name for disk image should be passed without escaping quotes
macdisk.depends = macdeploy
......@@ -407,7 +440,7 @@ win32 {
QMAKE_CLEAN += $${TARGET_DIR_WIN}$${DIR_SEPARATOR}*.exe \
$${TARGET_DIR_WIN}$${DIR_SEPARATOR}*.dll
} else:macx {
QMAKE_CLEAN += -r $${DESTDIR}/*.app
QMAKE_CLEAN += -r $${DESTDIR}/*.app $${DESTDIR}/*.pkg $${DESTDIR}/*.dmg $${DESTDIR}/temp
} else {
QMAKE_CLEAN += -r $${DESTDIR}/*
}
......@@ -39,7 +39,6 @@ FunctionEnd
; Pages
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "../../COPYING"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
......
#!/bin/sh
appname="YKPersonalization"
appname="yubikey-personalization-gui"
dirname=`dirname "$0"`
tmp="${dirname#?}"
......
[Desktop Entry]
Name=YubiKey Personalization Tool
GenericName=YubiKey Personalization Tool
Comment=Graphical interface for programing a YubiKey
Exec=yubikey-personalization-gui
Icon=yubikey-personalization-gui
StartupNotify=true
Terminal=false
Type=Application
Categories=Utility;
/* XPM */
static char * icon_xpm[] = {
"32 32 2 1",
" c None",
". c #8BBF41",
" ........ ",
" .... .... ",
" ... ... ",
" ... ... ",
" .. .. ",
" .. .. ",
" . . ",
" .. .. ",
" .. .... ... .. ",
" .. .... .... .. ",
" . ... .... . ",
" .. .... ... .. ",
" .. ... .... .. ",
" . ... ... . ",
".. .... ... ..",
".. ....... ..",
".. ...... ..",
" . ...... . ",
" .. ..... .. ",
" .. .... .. ",
" .. .... .. ",
" . .... . ",
" .. .... .. ",
" . ..... . ",
" .. .. ",
" .. .. ",
" .. .. ",
" .. .. ",
" ... ... ",
" .... .... ",
" ........ ",
" "};
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>BundleHasStrictIdentifier</key>
<true/>
<key>BundleIsRelocatable</key>
<false/>
<key>BundleIsVersionChecked</key>
<true/>
<key>BundleOverwriteAction</key>
<string>upgrade</string>
<key>RootRelativeBundlePath</key>
<string>YubiKey Personalization Tool.app</string>
</dict>
</array>
</plist>
......@@ -138,6 +138,7 @@ typedef std::vector<int>::size_type size_t;
#define SG_LOG_DISABLED "Log/Disabled"
#define SG_LOG_FILENAME "Log/Filename"
#define SG_LOG_FORMAT "Log/Format"
#define SG_TAB_FIRST "Flag/TabTirst"
#define SG_APPEND_TAB1 "Flag/AppendTab1"
......
......@@ -526,6 +526,9 @@ void ChalRespPage::writeQuickConfig() {
//Programming mode...
m_ykConfig->setProgrammingMode(YubiKeyConfig::Mode_ChalRespYubico);
// set serial
m_ykConfig->setSerial(QString::number(YubiKeyFinder::getInstance()->serial()));
//Configuration slot...
int configSlot = 1;
if(ui->quickConfigSlot2Radio->isChecked()) {
......@@ -868,6 +871,9 @@ void ChalRespPage::writeAdvConfig() {
//Programming mode...
m_ykConfig->setProgrammingMode(YubiKeyConfig::Mode_ChalRespHmac);
// set serial
m_ykConfig->setSerial(QString::number(YubiKeyFinder::getInstance()->serial()));
//Configuration slot...
int configSlot = 1;
if(ui->advConfigSlot2Radio->isChecked()) {
......
......@@ -30,7 +30,7 @@
color: rgb(0, 0, 0);</string>
</property>
<property name="currentIndex">
<number>2</number>
<number>1</number>
</property>
<widget class="QWidget" name="basePage">
<widget class="QLabel" name="baseHeadingLbl">
......@@ -444,7 +444,7 @@ color: rgb(118, 116, 108);</string>
<x>10</x>
<y>45</y>
<width>151</width>
<height>17</height>
<height>19</height>
</rect>
</property>
<property name="styleSheet">
......@@ -466,7 +466,7 @@ color: rgb(118, 116, 108);</string>
<x>240</x>
<y>45</y>
<width>151</width>
<height>17</height>
<height>19</height>
</rect>
</property>
<property name="styleSheet">
......@@ -1316,7 +1316,7 @@ color: rgb(118, 116, 108);</string>
<x>10</x>
<y>45</y>
<width>151</width>
<height>17</height>
<height>19</height>
</rect>
</property>
<property name="styleSheet">
......@@ -1338,7 +1338,7 @@ color: rgb(118, 116, 108);</string>
<x>240</x>
<y>45</y>
<width>151</width>
<height>17</height>
<height>19</height>
</rect>
</property>
<property name="styleSheet">
......@@ -1818,9 +1818,9 @@ font-weight: bold;</string>
</property>
</item>
<item>
<property name="text">
<string>Same Secret for all Keys</string>
</property>
<property name="text">
<string>Same Secret for all Keys</string>
</property>
</item>
</widget>
</widget>
......
......@@ -277,6 +277,18 @@ void MainWindow::keyFound(bool found, bool* featuresMatrix) {
if(found) {
YubiKeyFinder *finder = YubiKeyFinder::getInstance();
int touchLevel = finder->touchLevel();
qDebug() << "touchLevel is " << touchLevel;
if(touchLevel & CONFIG1_VALID && touchLevel & CONFIG2_VALID) {
ui->programLbl->setText(tr("Slot 1 and 2 configured"));
} else if(touchLevel & CONFIG1_VALID) {
ui->programLbl->setText(tr("Slot 1 configured"));
} else if(touchLevel & CONFIG2_VALID) {
ui->programLbl->setText(tr("Slot 2 configured"));
} else {
ui->programLbl->setText(tr("Not configured"));
}
unsigned int version = finder->version();
ui->statusLbl->setText(KEY_FOUND);
ui->statusLbl->setStyleSheet(QString::fromUtf8(SS_YKSTATUS_SUCCESS));
......@@ -415,6 +427,7 @@ void MainWindow::keyFound(bool found, bool* featuresMatrix) {
ui->ndefSupportLbl->setPixmap(CROSSMAP);
}
} else {
ui->programLbl->clear();
ui->deviceImage->setHidden(true);
if(ui->deviceImage->movie()) {
delete(ui->deviceImage->movie());
......
......@@ -128,7 +128,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry">
<rect>
<x>10</x>
<y>210</y>
<y>260</y>
<width>151</width>
<height>16</height>
</rect>
......@@ -138,7 +138,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry">
<rect>
<x>10</x>
<y>190</y>
<y>240</y>
<width>151</width>
<height>16</height>
</rect>
......@@ -535,7 +535,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry">
<rect>
<x>8</x>
<y>250</y>
<y>275</y>
<width>155</width>
<height>105</height>
</rect>
......@@ -782,6 +782,32 @@ border-radius: 2px;</string>
</property>
</widget>
</widget>
<widget class="QLabel" name="programDescLbl">
<property name="geometry">
<rect>
<x>10</x>
<y>200</y>
<width>151</width>
<height>16</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">font-weight: bold;</string>
</property>
<property name="text">
<string>Programming status:</string>
</property>
</widget>
<widget class="QLabel" name="programLbl">
<property name="geometry">
<rect>
<x>10</x>
<y>220</y>
<width>151</width>
<height>16</height>
</rect>
</property>
</widget>
</widget>
<widget class="QStackedWidget" name="pagesWidget">
<property name="geometry">
......
......@@ -488,6 +488,9 @@ void OathPage::writeQuickConfig() {
//Programming mode...
m_ykConfig->setProgrammingMode(YubiKeyConfig::Mode_OathHotp);
// set serial
m_ykConfig->setSerial(QString::number(YubiKeyFinder::getInstance()->serial()));
//Configuration slot...
int configSlot = 1;
if(ui->quickConfigSlot2Radio->isChecked()) {
......@@ -1004,6 +1007,9 @@ void OathPage::writeAdvConfig() {
//Programming mode...
m_ykConfig->setProgrammingMode(YubiKeyConfig::Mode_OathHotp);
// set serial
m_ykConfig->setSerial(QString::number(YubiKeyFinder::getInstance()->serial()));
//Configuration slot...
int configSlot = 1;
if(ui->advConfigSlot2Radio->isChecked()) {
......
......@@ -30,7 +30,7 @@
color: rgb(0, 0, 0);</string>
</property>
<property name="currentIndex">
<number>2</number>
<number>1</number>
</property>
<widget class="QWidget" name="basePage">
<widget class="QLabel" name="baseHeadingLbl">
......@@ -227,7 +227,7 @@ color: rgb(118, 116, 108)</string>
<x>10</x>
<y>45</y>
<width>151</width>