Commit f2b68d37 authored by Klas Lindfors's avatar Klas Lindfors

Imported Upstream version 3.1.6

parent 1a70535d
2013-02-21 Klas Lindfors <klas@yubico.com>
* NEWS: news for override box
2013-02-21 Klas Lindfors <klas@yubico.com>
* src/common.h, src/ui/confirmbox.cpp, src/ui/toolpage.cpp: make the
override box on ndef without http work
2013-02-21 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: point to rcc for win32 build
2013-02-21 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: declare that we use exceptions
2013-02-21 Klas Lindfors <klas@yubico.com>
* NEWS: release 3.1.6
2013-02-18 Klas Lindfors <klas@yubico.com>
* src/yubikeywriter.cpp: only set imf if the key is capable of it
2013-02-18 Dain Nilsson <dain@yubico.com>
* src/yubikeyfinder.cpp: Fixed memory leak introduced in last
commit.
2013-02-08 Dain Nilsson <dain@yubico.com>
* src/yubikeyfinder.cpp: Only lock the YubiKey when we have window
focus.
2013-01-10 Klas Lindfors <klas@yubico.com>
* NEWS, YKPersonalization.pro, src/version.h: bump versions after
release
2013-01-10 Klas Lindfors <klas@yubico.com>
* NEWS: release 3.1.5
......
yubikey-personalization-gui NEWS -- History of user-visible changes. -*- outline -*-
* Version 3.1.6 (released 2013-02-21)
** Only lock the key when window has focus.
** Fix OATH configuration for 2.1 keys.
** Make the override box on the http warning for NDEF work.
* Version 3.1.5 (released 2013-01-10)
** Fixup building on osx.
......
#
# global definitions
#
VERSION = "3.1.5"
VERSION = "3.1.6"
APP_NAME = $$quote(YubiKey Personalization Tool)
#
......@@ -14,6 +14,8 @@ TARGET = yubikey-personalization-gui
DEFINES += VERSION=\\\"$${VERSION}\\\"
CONFIG += exceptions
CONFIG += silent
CONFIG(debug, debug|release) {
......@@ -137,6 +139,7 @@ cross {
QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
QMAKE_IDC = $$[QT_INSTALL_BINS]/idc
QMAKE_RCC = $$[QT_INSTALL_BINS]/rcc
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
}
......
......@@ -167,6 +167,7 @@ typedef std::vector<int>::size_type size_t;
#define SG_OVERWRITE_CONF_SLOT1 "DontAsk/Slot1Overwriting"
#define SG_DIFF_PUBLIC_ID_LEN "DontAsk/PublicIdLen"
#define SG_ENABLE_CONF_PROTECTION "DontAsk/ConfProtection"
#define SG_NDEF_WITHOUT_HTTP "DontAsk/NdefWithoutHttp"
#define SG_ANIMATIONS_PREFERENCE "Preference/Animations"
......
......@@ -96,5 +96,9 @@ void ConfirmBox::on_dontaskCheck_stateChanged(int state) {
case Confirm_ConfigurationProtection:
settings.setValue(SG_ENABLE_CONF_PROTECTION, checked);
break;
case Confirm_NdefWithoutHttp:
settings.setValue(SG_NDEF_WITHOUT_HTTP, checked);
break;
}
}
......@@ -316,6 +316,7 @@ void ToolPage::resetNdefPage() {
}
void ToolPage::programNdef() {
QSettings settings;
YubiKeyWriter *writer = YubiKeyWriter::getInstance();
bool uri = true;
QString language;
......@@ -333,7 +334,7 @@ void ToolPage::programNdef() {
return;
}
if(uri) {
if(uri && !settings.value(SG_NDEF_WITHOUT_HTTP).toBool()) {
if(!payload.startsWith("http")) {
ConfirmBox confirm(this);
confirm.setConfirmIndex(ConfirmBox::Confirm_NdefWithoutHttp);
......
......@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef VERSION_H
#define VERSION_H
#define VER_PRODUCTVERSION 3,1,5,0
#define VER_PRODUCTVERSION_STR "3.1.5\0"
#define VER_PRODUCTVERSION 3,1,6,0
#define VER_PRODUCTVERSION_STR "3.1.6\0"
#define VER_FILEDESCRIPTION_STR "YubiKey Personalization Tool"
#define VER_INTERNALNAME_STR "YKPersonalization"
......
......@@ -192,6 +192,11 @@ bool YubiKeyFinder::closeKey() {
}
void YubiKeyFinder::findKey() {
if(QApplication::activeWindow() == 0) {
//No focus, avoid locking the YubiKey.
return;
}
YK_STATUS *ykst = ykds_alloc();
bool error = false;
......
......@@ -116,6 +116,7 @@ void YubiKeyWriter::writeConfig(YubiKeyConfig *ykConfig) {
// Check features support
bool flagSrNoSupport = false;
bool flagUpdateSupport = false;
bool flagImfSupport = false;
if(YubiKeyFinder::getInstance()->checkFeatureSupport(
YubiKeyFinder::Feature_SerialNumber)) {
flagSrNoSupport = true;
......@@ -124,6 +125,10 @@ void YubiKeyWriter::writeConfig(YubiKeyConfig *ykConfig) {
YubiKeyFinder::Feature_Updatable)) {
flagUpdateSupport = true;
}
if(YubiKeyFinder::getInstance()->checkFeatureSupport(
YubiKeyFinder::Feature_MovingFactor)) {
flagImfSupport = true;
}
YubiKeyFinder::getInstance()->stop();
......@@ -190,7 +195,7 @@ void YubiKeyWriter::writeConfig(YubiKeyConfig *ykConfig) {
CFGFLAG(OATH_FIXED_MODHEX, ykConfig->oathFixedModhex());
//Moving Factor Seed...
if(!ykp_set_oath_imf(cfg, ykConfig->oathMovingFactorSeed())) {
if(flagImfSupport && !ykp_set_oath_imf(cfg, ykConfig->oathMovingFactorSeed())) {
throw 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment