Hello community,
here is the log from the commit of package yubikey-personalization-gui for
openSUSE:Factory checked in at 2016-01-08 15:23:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yubikey-personalization-gui (Old)
and /work/SRC/openSUSE:Factory/.yubikey-personalization-gui.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yubikey-personalization-gui"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yubikey-personalization-gui/yubikey-personalization-gui.changes
2015-10-08 08:24:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yubikey-personalization-gui.new/yubikey-personalization-gui.changes
2016-01-08 15:23:56.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Jan 7 15:37:41 UTC 2016 - [email protected]
+
+- Version 3.1.24 (released 2016-01-04)
+ - Fix a bug when doing consecutive programming that reset id to 0.
+ - Fix a case where the image on an old key might be shown momentarily.
+ - Updated icons and images.
+ - Updated mac and windows builds to qt 5.5.
+
+-------------------------------------------------------------------
Old:
----
yubikey-personalization-gui-3.1.23.tar.gz
yubikey-personalization-gui-3.1.23.tar.gz.sig
New:
----
yubikey-personalization-gui-3.1.24.tar.gz
yubikey-personalization-gui-3.1.24.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yubikey-personalization-gui.spec ++++++
--- /var/tmp/diff_new_pack.QlGuR1/_old 2016-01-08 15:23:57.000000000 +0100
+++ /var/tmp/diff_new_pack.QlGuR1/_new 2016-01-08 15:23:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yubikey-personalization-gui
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yubikey-personalization-gui
-Version: 3.1.23
+Version: 3.1.24
Release: 0
Summary: GUI for Yubikey personalization
License: BSD-2-Clause
++++++ yubikey-personalization-gui-3.1.23.tar.gz ->
yubikey-personalization-gui-3.1.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-personalization-gui-3.1.23/.travis.yml
new/yubikey-personalization-gui-3.1.24/.travis.yml
--- old/yubikey-personalization-gui-3.1.23/.travis.yml 2015-10-01
12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/.travis.yml 2016-01-04
12:15:45.000000000 +0100
@@ -1,12 +1,11 @@
language: cpp
+os:
+ - linux
+ - osx
compiler:
- gcc
- clang
-before_install:
- - sudo add-apt-repository -y ppa:yubico/stable
- - sudo apt-get update -qq
- - sudo apt-get install -qq -y --no-install-recommends libyubikey-dev
libykpers-1-dev qt4-qmake libqt4-dev
+before_install: ./prepare-travis.sh
install:
- - qmake 'CONFIG += debug'
- make all
script: make check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-personalization-gui-3.1.23/ChangeLog
new/yubikey-personalization-gui-3.1.24/ChangeLog
--- old/yubikey-personalization-gui-3.1.23/ChangeLog 2015-10-01
12:33:06.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/ChangeLog 2016-01-04
12:16:28.000000000 +0100
@@ -1,3 +1,78 @@
+2016-01-04 Klas Lindfors <[email protected]>
+
+ * NEWS: NEWS for 3.1.24
+
+2016-01-04 Klas Lindfors <[email protected]>
+
+ * src/version.h: update copyright years
+
+2015-12-30 Klas Lindfors <[email protected]>
+
+ * src/src.pro: name mac installer correctly
+
+2015-12-30 Klas Lindfors <[email protected]>
+
+ * src/ui/mainwindow.cpp: don't show a key if version is 0
+
+2015-12-28 Klas Lindfors <[email protected]>
+
+ * src/src.pro: fixup sed invocation
+
+2015-12-28 Klas Lindfors <[email protected]>
+
+ * installer/win-nsis/ykpers.nsi, src/src.pro: newer qt has
+ qtaccessiblewidgets included and new names on some dlls on mac
libqtcocoa also depends on QtDBus
+
+2015-12-29 Klas Lindfors <[email protected]>
+
+ * resources/resources.qrc, src/ui/mainwindow.cpp: drop devel key
+
+2015-12-28 Klas Lindfors <[email protected]>
+
+ * : new images for 2.3, neo, plus and edge
+
+2015-12-28 Klas Lindfors <[email protected]>
+
+ * resources/lin/yubikey-personalization-gui.xpm: new application
+ icons
+
+2015-12-21 Klas Lindfors <[email protected]>
+
+ * tests/yubikeyutiltest.cpp, tests/yubikeyutiltest.h: add tests for
+ getNextHex()/getNextModhex() with random output
+
+2015-12-21 Klas Lindfors <[email protected]>
+
+ * lib/yubikeyutil.cpp: getNextModhex() has to call qstrModhexClean()
+
+2015-12-21 Klas Lindfors <[email protected]>
+
+ * tests/yubikeyutiltest.cpp, tests/yubikeyutiltest.h: add tests that
+ show that getNextModhex() is broken
+
+2015-10-09 Klas Lindfors <[email protected]>
+
+ * src/src.pro: for osx always set ICON, for pkgconfig set
+ QMAKE_INFO_PLIST
+
+2015-10-09 Klas Lindfors <[email protected]>
+
+ * resources/mac/Info.plist.in, src/src.pro: use @SHORT_VERSION@ and
+ @FULL_VERSION@ for Info.plist
+
+2015-10-09 Klas Lindfors <[email protected]>
+
+ * prepare-travis.sh, src/src.pro: if we're using pkgconfig it makes
+ sense to enable it always
+
+2015-10-08 Klas Lindfors <[email protected]>
+
+ * .travis.yml, prepare-travis.sh: add travis build for osx
+
+2015-10-01 Klas Lindfors <[email protected]>
+
+ * NEWS, src/src.pro: bump versions
+
2015-10-01 Klas Lindfors <[email protected]>
* NEWS: NEWS for 3.1.23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-personalization-gui-3.1.23/NEWS
new/yubikey-personalization-gui-3.1.24/NEWS
--- old/yubikey-personalization-gui-3.1.23/NEWS 2015-10-01 12:32:44.000000000
+0200
+++ new/yubikey-personalization-gui-3.1.24/NEWS 2016-01-04 12:15:45.000000000
+0100
@@ -1,5 +1,15 @@
yubikey-personalization-gui NEWS -- History of user-visible changes. -*-
outline -*-
+* Version 3.1.24 (released 2016-01-04)
+
+** Fix a bug when doing consecutive programming that reset id to 0.
+
+** Fix a case where the image on an old key might be shown momentarily.
+
+** Updated icons and images.
+
+** Updated mac and windows builds to qt 5.5.
+
* Version 3.1.23 (released 2015-10-01)
** Fix a bug that caused a crash on selecting keyboard layout.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/installer/win-nsis/ykpers.nsi
new/yubikey-personalization-gui-3.1.24/installer/win-nsis/ykpers.nsi
--- old/yubikey-personalization-gui-3.1.23/installer/win-nsis/ykpers.nsi
2015-10-01 12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/installer/win-nsis/ykpers.nsi
2016-01-04 12:15:45.000000000 +0100
@@ -69,15 +69,13 @@
FILE ../../build/release/libgcc_s_dw2-1.dll
FILE ../../build/release/libwinpthread-1.dll
FILE ../../build/release/libstdc++-6.dll
- FILE ../../build/release/icuin52.dll
- FILE ../../build/release/icuuc52.dll
- FILE ../../build/release/icudt52.dll
+ FILE ../../build/release/icuin54.dll
+ FILE ../../build/release/icuuc54.dll
+ FILE ../../build/release/icudt54.dll
SetOutPath $INSTDIR\licenses
FILE /r ../../build/release/licenses/
SetOutPath $INSTDIR\imageformats
FILE ../../build/release/qmng.dll
- SetOutPath $INSTDIR\accessible
- FILE ../../build/release/qtaccessiblewidgets.dll
SetOutPath $INSTDIR\platforms
FILE ../../build/release/qwindows.dll
SectionEnd
@@ -133,12 +131,11 @@
DELETE "$INSTDIR\libgcc_s_dw2-1.dll"
DELETE "$INSTDIR\libwinpthread-1.dll"
DELETE "$INSTDIR\libstdc++-6.dll"
- DELETE "$INSTDIR\icuin52.dll"
- DELETE "$INSTDIR\icuuc52.dll"
- DELETE "$INSTDIR\icudt52.dll"
+ DELETE "$INSTDIR\icuin54.dll"
+ DELETE "$INSTDIR\icuuc54.dll"
+ DELETE "$INSTDIR\icudt54.dll"
DELETE "$INSTDIR\licenses\*"
DELETE "$INSTDIR\imageformats\qmng.dll"
- DELETE "$INSTDIR\accessible\qtaccessiblewidgets.dll"
DELETE "$INSTDIR\platforms\qwindows.dll"
RMDir "$INSTDIR\licenses"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/lib/yubikeyutil.cpp
new/yubikey-personalization-gui-3.1.24/lib/yubikeyutil.cpp
--- old/yubikey-personalization-gui-3.1.23/lib/yubikeyutil.cpp 2015-10-01
12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/lib/yubikeyutil.cpp 2016-01-04
12:15:45.000000000 +0100
@@ -346,10 +346,12 @@
QString YubiKeyUtil::getNextModhex(size_t resultLen,
const QString &str, int scheme) {
+ QString tmpStr(str);
+ qstrModhexClean(&tmpStr, resultLen);
unsigned char result[resultLen];
size_t len;
QString hex;
- qstrModhexDecode(result, &len, str);
+ qstrModhexDecode(result, &len, tmpStr);
if(len == 0) {
return "";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-personalization-gui-3.1.23/prepare-travis.sh
new/yubikey-personalization-gui-3.1.24/prepare-travis.sh
--- old/yubikey-personalization-gui-3.1.23/prepare-travis.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/yubikey-personalization-gui-3.1.24/prepare-travis.sh 2016-01-04
12:15:45.000000000 +0100
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+set -x
+
+if [ "x$TRAVIS_OS_NAME" != "xosx" ]; then
+ sudo add-apt-repository -y ppa:yubico/stable
+ sudo apt-get update -qq
+ sudo apt-get install -qq -y --no-install-recommends libyubikey-dev
libykpers-1-dev qt4-qmake libqt4-dev
+ QMAKE=qmake
+else
+ brew update
+ brew install qt5
+ brew install libyubikey
+ brew install ykpers
+ QMAKE=/usr/local/opt/qt5/bin/qmake
+ CXXFLAGS="-I/usr/local/include"
+ LDFLAGS="-L/usr/local/lib"
+fi
+
+$QMAKE 'CONFIG += debug nosilent force_pkgconfig' "CXXFLAGS=$CXXFLAGS"
"LDFLAGS=$LDFLAGS"
Files old/yubikey-personalization-gui-3.1.23/resources/images/edge.mng and
new/yubikey-personalization-gui-3.1.24/resources/images/edge.mng differ
Files
old/yubikey-personalization-gui-3.1.23/resources/images/neo_production_33.mng
and
new/yubikey-personalization-gui-3.1.24/resources/images/neo_production_33.mng
differ
Files old/yubikey-personalization-gui-3.1.23/resources/images/plus.mng and
new/yubikey-personalization-gui-3.1.24/resources/images/plus.mng differ
Files old/yubikey-personalization-gui-3.1.23/resources/images/v2-3-animated.mng
and new/yubikey-personalization-gui-3.1.24/resources/images/v2-3-animated.mng
differ
Files old/yubikey-personalization-gui-3.1.23/resources/images/yubikey_devel.png
and new/yubikey-personalization-gui-3.1.24/resources/images/yubikey_devel.png
differ
Files
old/yubikey-personalization-gui-3.1.23/resources/lin/yubikey-personalization-gui.png
and
new/yubikey-personalization-gui-3.1.24/resources/lin/yubikey-personalization-gui.png
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/resources/lin/yubikey-personalization-gui.xpm
new/yubikey-personalization-gui-3.1.24/resources/lin/yubikey-personalization-gui.xpm
---
old/yubikey-personalization-gui-3.1.23/resources/lin/yubikey-personalization-gui.xpm
2015-10-01 12:32:44.000000000 +0200
+++
new/yubikey-personalization-gui-3.1.24/resources/lin/yubikey-personalization-gui.xpm
2016-01-04 12:15:45.000000000 +0100
@@ -1,37 +1,414 @@
/* XPM */
-static char * icon_xpm[] = {
-"32 32 2 1",
-" c None",
-". c #8BBF41",
-" ........ ",
-" .... .... ",
-" ... ... ",
-" ... ... ",
-" .. .. ",
-" .. .. ",
-" . . ",
-" .. .. ",
-" .. .... ... .. ",
-" .. .... .... .. ",
-" . ... .... . ",
-" .. .... ... .. ",
-" .. ... .... .. ",
-" . ... ... . ",
-".. .... ... ..",
-".. ....... ..",
-".. ...... ..",
-" . ...... . ",
-" .. ..... .. ",
-" .. .... .. ",
-" .. .... .. ",
-" . .... . ",
-" .. .... .. ",
-" . ..... . ",
-" .. .. ",
-" .. .. ",
-" .. .. ",
-" .. .. ",
-" ... ... ",
-" .... .... ",
-" ........ ",
-" "};
+static char * yubikey_personalization_gui_xpm[] = {
+"32 32 379 2",
+" c None",
+". c #A4CF51",
+"+ c #A5CF51",
+"@ c #A5D051",
+"# c #A4CF52",
+"$ c #A7D252",
+"% c #9BCA41",
+"& c #B1D66B",
+"* c #C8E296",
+"= c #D1E5A8",
+"- c #9FCC48",
+"; c #ADD463",
+"> c #D4E8AC",
+", c #BFDD86",
+"' c #A6D056",
+") c #9DCC45",
+"! c #A5CF52",
+"~ c #A3CE51",
+"{ c #A6D152",
+"] c #A1CD4C",
+"^ c #D0E6A5",
+"/ c #FDFEFC",
+"( c #FFFFFF",
+"_ c #EEEEEC",
+": c #96C240",
+"< c #B4D870",
+"[ c #F0F7E3",
+"} c #C2DE8A",
+"| c #9DCB43",
+"1 c #A7D352",
+"2 c #A5D152",
+"3 c #9FCC47",
+"4 c #C5E091",
+"5 c #F3F3F2",
+"6 c #AED06B",
+"7 c #C5E090",
+"8 c #F8FBF2",
+"9 c #B2D66B",
+"0 c #A2CE4D",
+"a c #A4CE51",
+"b c #A8D453",
+"c c #A1CD4B",
+"d c #E1EFC4",
+"e c #C8E397",
+"f c #A4CF50",
+"g c #ABD954",
+"h c #A7D452",
+"i c #A0CD4A",
+"j c #A5D053",
+"k c #9EC453",
+"l c #F8F7F8",
+"m c #EEF1E7",
+"n c #7C9E39",
+"o c #A5D14F",
+"p c #A2CE4E",
+"q c #A8D552",
+"r c #DDEDC0",
+"s c #B9DA7A",
+"t c #9FCD46",
+"u c #DFECC7",
+"v c #C0D0A2",
+"w c #A0D042",
+"x c #CFE5A4",
+"y c #C9E399",
+"z c #A3CF50",
+"A c #A5CF53",
+"B c #B8DA79",
+"C c #E9F3D5",
+"D c #B0D566",
+"E c #ACD461",
+"F c #ACD45F",
+"G c #D8E6BB",
+"H c #A6D055",
+"I c #ABD658",
+"J c #E3E3E3",
+"K c #E8F2D3",
+"L c #AAD25D",
+"M c #9DCB44",
+"N c #FBFDF8",
+"O c #CEE5A1",
+"P c #A8CA66",
+"Q c #DAEBB8",
+"R c #A3CE4F",
+"S c #97B658",
+"T c #FAF8FE",
+"U c #E9F3D7",
+"V c #9FCD47",
+"W c #C3DF8C",
+"X c #FBFDF7",
+"Y c #9CCB42",
+"Z c #9FCE43",
+"` c #ECECEA",
+" . c #B5D872",
+".. c #A4D04D",
+"+. c #B3BD9D",
+"@. c #ADD067",
+"#. c #A2CC4F",
+"$. c #9DCA43",
+"%. c #EEF6E0",
+"&. c #B8D977",
+"*. c #C4D899",
+"=. c #FBFDF9",
+"-. c #9CCA41",
+";. c #A3CE50",
+">. c #A2CD4F",
+",. c #9CC649",
+"'. c #E1DCE9",
+"). c #D1DFB5",
+"!. c #A4CF4E",
+"~. c #A9D651",
+"{. c #A1CC4D",
+"]. c #A0CB4B",
+"^. c #FCFCFC",
+"/. c #FBFBFB",
+"(. c #E1EEC6",
+"_. c #A1CE4B",
+":. c #A0C753",
+"<. c #FFFDFF",
+"[. c #D3E7AA",
+"}. c #A1CC4E",
+"|. c #A0CA4D",
+"1. c #9DB174",
+"2. c #F6F5F8",
+"3. c #95C33B",
+"4. c #A3CE4E",
+"5. c #9FCA4C",
+"6. c #A0CA4C",
+"7. c #B6D778",
+"8. c #FAF9FD",
+"9. c #F8F8F8",
+"0. c #FEFCFF",
+"a. c #A2D049",
+"b. c #DCE2CE",
+"c. c #FDFAFF",
+"d. c #ADD363",
+"e. c #A0CB4C",
+"f. c #9FC94B",
+"g. c #9ECD42",
+"h. c #C6C4C7",
+"i. c #97BC4E",
+"j. c #9EC94B",
+"k. c #9BC44A",
+"l. c #9BC548",
+"m. c #9EC94A",
+"n. c #C5DD94",
+"o. c #FBFBFC",
+"p. c #F4F4F4",
+"q. c #C9E199",
+"r. c #B6D083",
+"s. c #F2F5EC",
+"t. c #97C63C",
+"u. c #9DC84A",
+"v. c #9CC648",
+"w. c #8EAB53",
+"x. c #F6F5F9",
+"y. c #F3F3F3",
+"z. c #FFFEFF",
+"A. c #A8C56E",
+"B. c #99C348",
+"C. c #98C246",
+"D. c #9BC647",
+"E. c #94C03F",
+"F. c #7BA22D",
+"G. c #AEC580",
+"H. c #F0F0F1",
+"I. c #F0F0F0",
+"J. c #EEEFE7",
+"K. c #9CCB41",
+"L. c #A1CB4D",
+"M. c #97C340",
+"N. c #C9DAA3",
+"O. c #9DC749",
+"P. c #9BC547",
+"Q. c #9AC742",
+"R. c #B0B89E",
+"S. c #F2F2F2",
+"T. c #FBF9FF",
+"U. c #6B931B",
+"V. c #7CA42D",
+"W. c #8DB43E",
+"X. c #98C247",
+"Y. c #96C144",
+"Z. c #9AC446",
+"`. c #9CC64D",
+" + c #A0C653",
+".+ c #C2D796",
+"++ c #EBECEC",
+"@+ c #ECECEC",
+"#+ c #EFEDF3",
+"$+ c #B1D36D",
+"%+ c #9DC849",
+"&+ c #99C345",
+"*+ c #98C244",
+"=+ c #8FB83F",
+"-+ c #DBD6E2",
+";+ c #F4F2F9",
+">+ c #8DB342",
+",+ c #9FC653",
+"'+ c #9CC64A",
+")+ c #99C445",
+"!+ c #96BF45",
+"~+ c #95BF43",
+"{+ c #BED48E",
+"]+ c #EFECF5",
+"^+ c #ECEAEF",
+"/+ c #E8E8E8",
+"(+ c #D1DEB5",
+"_+ c #9BC745",
+":+ c #9AC546",
+"<+ c #98C344",
+"[+ c #97C143",
+"}+ c #95BF42",
+"|+ c #96A870",
+"1+ c #EFF0EF",
+"2+ c #E7E7E7",
+"3+ c #F1EEF6",
+"4+ c #F4EFFC",
+"5+ c #9FBC65",
+"6+ c #97C144",
+"7+ c #92BB42",
+"8+ c #94BF41",
+"9+ c #95C042",
+"0+ c #A8C968",
+"a+ c #E7E5EA",
+"b+ c #E4E4E4",
+"c+ c #EBE7F1",
+"d+ c #97C440",
+"e+ c #94BF40",
+"f+ c #93C238",
+"g+ c #BEBBC1",
+"h+ c #82A63A",
+"i+ c #95C041",
+"j+ c #93BE40",
+"k+ c #8FBC36",
+"l+ c #E9E4F1",
+"m+ c #E1E1E1",
+"n+ c #B7CF87",
+"o+ c #97C043",
+"p+ c #92BC3F",
+"q+ c #85A14D",
+"r+ c #E8E7E9",
+"s+ c #DEDDDD",
+"t+ c #7EA92A",
+"u+ c #98C541",
+"v+ c #96C340",
+"w+ c #8EBB37",
+"x+ c #CED7BA",
+"y+ c #DEDEDE",
+"z+ c #D8DCCE",
+"A+ c #8DBB34",
+"B+ c #92BD3E",
+"C+ c #91BC3E",
+"D+ c #93C139",
+"E+ c #A8AF9A",
+"F+ c #DFDFDF",
+"G+ c #DDDEDD",
+"H+ c #A7B38E",
+"I+ c #97C341",
+"J+ c #93BE3F",
+"K+ c #A5C467",
+"L+ c #E1E0E4",
+"M+ c #BACF93",
+"N+ c #91BC3D",
+"O+ c #89B03C",
+"P+ c #D2CFD9",
+"Q+ c #EAE8EE",
+"R+ c #7B9D39",
+"S+ c #91BB3E",
+"T+ c #8AB23C",
+"U+ c #93BF3E",
+"V+ c #8BBA31",
+"W+ c #D5DAC9",
+"X+ c #DEDEDD",
+"Y+ c #DDDDDD",
+"Z+ c #E1E1E3",
+"`+ c #E6E1EE",
+" @ c #95A672",
+".@ c #E5E5E4",
+"+@ c #E0E0E1",
+"@@ c #DDDDDC",
+"#@ c #B1B99E",
+"$@ c #8DB938",
+"%@ c #96C33E",
+"&@ c #94BC46",
+"*@ c #E4E0E9",
+"=@ c #DBDCD8",
+"-@ c #90A666",
+";@ c #E6E3EB",
+">@ c #C9D5B0",
+",@ c #8FBB37",
+"'@ c #91C036",
+")@ c #BBB8C1",
+"!@ c #DDDDDE",
+"~@ c #E7E6E9",
+"{@ c #8CA160",
+"]@ c #E2E0E7",
+"^@ c #E2E2E2",
+"/@ c #73982B",
+"(@ c #90BB3D",
+"_@ c #8CB63C",
+":@ c #94C03E",
+"<@ c #A5C06F",
+"[@ c #709032",
+"}@ c #92C133",
+"|@ c #C3CCAF",
+"1@ c #E2E0E6",
+"2@ c #A1C45C",
+"3@ c #92BD3D",
+"4@ c #86A050",
+"5@ c #E6E6E7",
+"6@ c #9CAE7B",
+"7@ c #95C140",
+"8@ c #98BA55",
+"9@ c #7D954B",
+"0@ c #95C23E",
+"a@ c #92BE3E",
+"b@ c #8FBD38",
+"c@ c #C5D3A6",
+"d@ c #E0DFE2",
+"e@ c #E2E1E3",
+"f@ c #A1B181",
+"g@ c #A0AE83",
+"h@ c #A1AF83",
+"i@ c #B7BAB0",
+"j@ c #E4E1EA",
+"k@ c #ADCB70",
+"l@ c #93BE3E",
+"m@ c #93BF3D",
+"n@ c #9AB75F",
+"o@ c #E4E1E8",
+"p@ c #E0E1E0",
+"q@ c #E1E1E0",
+"r@ c #E8E7EA",
+"s@ c #E4E4E6",
+"t@ c #D8DAD4",
+"u@ c #78943D",
+"v@ c #93C03E",
+"w@ c #94C040",
+"x@ c #84AC36",
+"y@ c #B8C0A5",
+"z@ c #EAE7EF",
+"A@ c #DCDCDC",
+"B@ c #7F9C44",
+"C@ c #9AAF6F",
+"D@ c #E2E1E5",
+"E@ c #E7E6EA",
+"F@ c #9AA87D",
+"G@ c #739927",
+"H@ c #95C13F",
+"I@ c #94C13E",
+"J@ c #94C23E",
+"K@ c #90BA3D",
+"L@ c #91BE39",
+"M@ c #82A53C",
+"N@ c #A7B48A",
+"O@ c #D2D3D0",
+"P@ c #EBE8F0",
+"Q@ c #E2DFE7",
+"R@ c #84B12B",
+"S@ c #A2C45F",
+"T@ c #F0EAF8",
+"U@ c #C0C5B3",
+"V@ c #92A36F",
+"W@ c #6E9425",
+"X@ c #8FB93D",
+"Y@ c #80AC2A",
+"Z@ c #779D2A",
+"`@ c #7D9C40",
+" # c #8EBA3B",
+".# c #779837",
+"+# c #719823",
+"@# c #84AE32",
+"## c #96C43F",
+"$# c #8AB23B",
+"%# c #8CB53C",
+"&# c #98C63F",
+"*# c #86AD3A",
+"=# c #85AB3B",
+"-# c #86AC3A",
+" . . . . + . @ + ",
+" . . . . # . . . . # . @ @ $ ",
+" . . . % & * = - ; > , ' ) ! ~ { ",
+" @ . # ] ^ / ( ( _ : < ( ( ( [ } | ! @ 1 ",
+" 2 . 3 4 ( ( ( ( ( 5 6 7 ( ( ( ( ( 8 9 0 a b ",
+" 2 . c d ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( e f ~ g ",
+" h . i j k l ( ( ( ( ( ( ( ( ( ( ( ( ( ( m n o p ~ q ",
+" . i r s t u ( ( ( ( ( ( ( ( ( ( ( ( ( ( v w x y z 1 ",
+" { A B ( ( C ( D E E F G ( ( ( ( ( H E E I J K ( ( L . 1 ",
+" 2 . M N ( ( ( ( O ! . . P ( ( ( ( Q R . . S T ( ( ( U V { ",
+" @ ! W ( ( ( ( ( X Y . . Z ` ( ( ( .. f ..+.( ( ( ( ( @.a #. ",
+" f $.%.( ( ( ( ( ( &.# . # *.( ( =.-.;.>.,.'.( ( ( ( ( ).!.~. ",
+" {.].( ^.^.^.^.^./.(._.. . :.<./.[.>.}.|.1.( ^.^.^.^./.2.3.4. ",
+"5.6.7.8.9.9.9.9.9.9.0.z . . a.b.c.d.e.f.g.h.9.9.9.9.9.9.( i.j.k.",
+"l.m.n.o.l p.p.p.p.p.p.q.! f ;.r.s.t.u.v.w.x.p.p.p.p.y.o.z.A.u.B.",
+"C.D.E.F.G.H.I.I.I.I.I.J.K.>.L.M.N.O.P.Q.R.S.I.I.I.I.T.U.V.W.P.X.",
+"Y.Z.`. +.+++@+@+@+@+@+#+$+e.j.%+&+Z.*+=+-+@+@+@+@+@+;+>+,+'+)+!+",
+"~+*+{+]+^+/+/+/+/+/+/+/+(+_+v.:+<+[+}+|+1+/+/+/+/+/+2+3+4+5+6+7+",
+"8+9+0+a+b+b+b+b+b+b+b+b+c+d+&+[+9+e+f+g+J b+b+b+b+b+b+b+3+h+i+ ",
+" j+k+l+m+m+m+m+m+m+m+m+m+n+o+8+j+p+q+r+m+m+m+m+m+m+m+m+s+t+u+ ",
+" v+w+x+y+y+y+y+y+y+y+y+y+z+A+B+C+D+E+F+y+y+y+y+y+y+y+G+H+I+J+ ",
+" C+C+K+L+y+y+y+y+y+y+y+G+M+p+N+N+O+P+y+y+y+y+y+y+y+y+Q+R+S+T+ ",
+" U+V+W+X+Y+Z+y+y+y+y+`+p+N+N+N+ @.@y+y+y+y+y++@y+@@#@$@%@ ",
+" U+N+&@*@=@-@;@y+y+X+>@,@N+N+'@)@!@y+y+y+y+~@{@]@^@/@(@_@ ",
+" :@B+<@[@}@|@y+y+1@2@B+3@N+4@5@y+y+y+y+y+6@7@8@9@: 0@ ",
+" a@3@b@c@d@y+y+e@f@g@g@h@i@y+y+y+y+y+y+j@k@N+l@:@ ",
+" m@N+N+n@o@Y+y+y+p@q@q@r@s@y+y+y+y+y+y+t@u@:@:@ ",
+" N+v@w@x@y@z@Y+y+y+A@B@C@D@y+X+F+E@F@G@H@I@ ",
+" J@K@L@M@N@O@P@Q@R@S@T@a+U@V@W@J+K@%@ ",
+" X@%@K@v+Y@Z@`@ #9+.#+#@#M.K@##$# ",
+" %#K@&#N+N+N+N+N+3@&#X@*# ",
+" =#-#-# "};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/resources/mac/Info.plist.in
new/yubikey-personalization-gui-3.1.24/resources/mac/Info.plist.in
--- old/yubikey-personalization-gui-3.1.23/resources/mac/Info.plist.in
2015-10-01 12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/resources/mac/Info.plist.in
2016-01-04 12:15:45.000000000 +0100
@@ -15,9 +15,9 @@
<key>CFBundleName</key>
<string>YubiKey Personalization Tool</string>
<key>CFBundleVersion</key>
- <string>@@version@@</string>
+ <string>@FULL_VERSION@</string>
<key>CFBundleShortVersionString</key>
- <string>@@version@@</string>
+ <string>@SHORT_VERSION@</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
</dict>
Files old/yubikey-personalization-gui-3.1.23/resources/mac/Yubico.icns and
new/yubikey-personalization-gui-3.1.24/resources/mac/Yubico.icns differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/resources/resources.qrc
new/yubikey-personalization-gui-3.1.24/resources/resources.qrc
--- old/yubikey-personalization-gui-3.1.23/resources/resources.qrc
2015-10-01 12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/resources/resources.qrc
2016-01-04 12:15:45.000000000 +0100
@@ -14,7 +14,6 @@
<file>images/v2-2-animated.mng</file>
<file>images/v2-3-animated.mng</file>
<file>images/neo_transparent.png</file>
- <file>images/yubikey_devel.png</file>
<file>images/neo_production.png</file>
<file>images/neo_production_33.mng</file>
<file>images/plus.mng</file>
Files old/yubikey-personalization-gui-3.1.23/resources/win/Yubico.ico and
new/yubikey-personalization-gui-3.1.24/resources/win/Yubico.ico differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-personalization-gui-3.1.23/src/src.pro
new/yubikey-personalization-gui-3.1.24/src/src.pro
--- old/yubikey-personalization-gui-3.1.23/src/src.pro 2015-10-01
12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/src/src.pro 2016-01-04
12:15:45.000000000 +0100
@@ -3,7 +3,7 @@
#
VERSION_MAJOR = 3
VERSION_MINOR = 1
-VERSION_BUILD = 23
+VERSION_BUILD = 24
VERSION = "$${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_BUILD}"
APP_NAME = $$quote(YubiKey Personalization Tool)
@@ -196,8 +196,7 @@
$$_QT_BINDIR$${DIR_SEPARATOR}Qt5Widgetsd.dll \
$$_QT_BINDIR$${DIR_SEPARATOR}Qt5Testd.dll \
$$_QT_PLUGINDIR$${DIR_SEPARATOR}platforms$${DIR_SEPARATOR}qwindowsd.dll \
-
$$_QT_PLUGINDIR$${DIR_SEPARATOR}imageformats$${DIR_SEPARATOR}qmngd.dll \
-
$$_QT_PLUGINDIR$${DIR_SEPARATOR}accessible$${DIR_SEPARATOR}qtaccessiblewidgetsd.dll
+
$$_QT_PLUGINDIR$${DIR_SEPARATOR}imageformats$${DIR_SEPARATOR}qmngd.dll
} else {
LIB_FILES += \
$$_QT_BINDIR$${DIR_SEPARATOR}Qt5Core.dll \
@@ -205,17 +204,16 @@
$$_QT_BINDIR$${DIR_SEPARATOR}Qt5Widgets.dll \
$$_QT_BINDIR$${DIR_SEPARATOR}Qt5Test.dll \
$$_QT_PLUGINDIR$${DIR_SEPARATOR}platforms$${DIR_SEPARATOR}qwindows.dll \
-
$$_QT_PLUGINDIR$${DIR_SEPARATOR}imageformats$${DIR_SEPARATOR}qmng.dll \
-
$$_QT_PLUGINDIR$${DIR_SEPARATOR}accessible$${DIR_SEPARATOR}qtaccessiblewidgets.dll
+
$$_QT_PLUGINDIR$${DIR_SEPARATOR}imageformats$${DIR_SEPARATOR}qmng.dll
}
LIB_FILES += \
$$_QT_BINDIR$${DIR_SEPARATOR}libgcc_s_dw2-1.dll \
$$_QT_BINDIR$${DIR_SEPARATOR}libwinpthread-1.dll \
$$_QT_BINDIR$${DIR_SEPARATOR}libstdc++-6.dll \
- $$_QT_BINDIR$${DIR_SEPARATOR}icuin52.dll \
- $$_QT_BINDIR$${DIR_SEPARATOR}icuuc52.dll \
- $$_QT_BINDIR$${DIR_SEPARATOR}icudt52.dll \
+ $$_QT_BINDIR$${DIR_SEPARATOR}icuin54.dll \
+ $$_QT_BINDIR$${DIR_SEPARATOR}icuuc54.dll \
+ $$_QT_BINDIR$${DIR_SEPARATOR}icudt54.dll \
..$${DIR_SEPARATOR}libs$${DIR_SEPARATOR}win32$${DIR_SEPARATOR}bin$${DIR_SEPARATOR}libjson-c-2.dll
\
..$${DIR_SEPARATOR}libs$${DIR_SEPARATOR}win32$${DIR_SEPARATOR}bin$${DIR_SEPARATOR}libyubikey-0.dll
\
..$${DIR_SEPARATOR}libs$${DIR_SEPARATOR}win32$${DIR_SEPARATOR}bin$${DIR_SEPARATOR}libykpers-1-1.dll
@@ -267,12 +265,19 @@
LIBS += -lyubikey
CONFIG += link_pkgconfig
+ QT_CONFIG -= no-pkg-config
PKGCONFIG += ykpers-1
+ macx {
+ QMAKE_INFO_PLIST = ../resources/mac/Info.plist.in
+ }
}
#
# MacOS X specific configuration
#
+macx {
+ ICON = ../resources/mac/Yubico.icns
+}
macx:!force_pkgconfig {
message("Mac build")
@@ -306,9 +311,6 @@
TARGET_MAC = $${TARGET}
TARGET_MAC ~= s, ,\\ ,g
- # The application icon
- ICON = ../resources/mac/Yubico.icns
-
BUILD = $$(BUILD)
isEmpty(BUILD) {
BUILD = 1
@@ -319,7 +321,7 @@
QMAKE_POST_LINK += $$quote(mkdir -p
$${DESTDIR}/$${TARGET_MAC}.app/Contents/Resources && \
cp -R ../resources/mac/Yubico.icns
$${DESTDIR}/$${TARGET_MAC}.app/Contents/Resources/. && \
cp ../resources/mac/qt.conf
$${DESTDIR}/$${TARGET_MAC}.app/Contents/Resources/. && \
- sed -e \'s|@@version@@|$$VERSION|g\' -e \'s|@@build@@|$$BUILD|g\' \
+ sed -e \'s|@SHORT_VERSION@|$$VERSION|g\' -e
\'s|@FULL_VERSION@|$$VERSION|g\' \
< ../resources/mac/Info.plist.in >
$${DESTDIR}/$${TARGET_MAC}.app/Contents/Info.plist)
# copy the QT libraries into our bundle
@@ -331,10 +333,9 @@
cp $$_QT_LIBDIR/QtGui.framework/Versions/5/QtGui $$_LIBDIR && \
cp $$_QT_LIBDIR/QtWidgets.framework/Versions/5/QtWidgets $$_LIBDIR && \
cp $$_QT_LIBDIR/QtPrintSupport.framework/Versions/5/QtPrintSupport
$$_LIBDIR && \
+ cp $$_QT_LIBDIR/QtDBus.framework/Versions/5/QtDBus $$_LIBDIR && \
mkdir -p $$_PLUGINDIR/imageformats && \
cp -R $$_QT_PLUGINDIR/imageformats/libqmng.dylib
$$_PLUGINDIR/imageformats && \
- mkdir -p $$_PLUGINDIR/accessible && \
- cp -R $$_QT_PLUGINDIR/accessible/libqtaccessiblewidgets.dylib
$$_PLUGINDIR/accessible && \
mkdir -p $$_PLUGINDIR/platforms && \
cp -R $$_QT_PLUGINDIR/platforms/libqcocoa.dylib $$_PLUGINDIR/platforms)
@@ -354,10 +355,11 @@
# fixup all library paths..
_BASE = $$quote(@executable_path/../Frameworks)
_LIBBASE = $$quote(@executable_path/../lib)
- _QTCORE = $$quote($${_QT_LIBDIR}/QtCore.framework/Versions/5/QtCore)
- _QTGUI = $$quote($${_QT_LIBDIR}/QtGui.framework/Versions/5/QtGui)
- _QTWIDGETS =
$$quote($${_QT_LIBDIR}/QtWidgets.framework/Versions/5/QtWidgets)
- _QTPRINTSUPPORT =
$$quote($${_QT_LIBDIR}/QtPrintSupport.framework/Versions/5/QtPrintSupport)
+ _QTCORE = $$quote(@rpath/QtCore.framework/Versions/5/QtCore)
+ _QTGUI = $$quote(@rpath/QtGui.framework/Versions/5/QtGui)
+ _QTWIDGETS = $$quote(@rpath/QtWidgets.framework/Versions/5/QtWidgets)
+ _QTPRINTSUPPORT =
$$quote(@rpath/QtPrintSupport.framework/Versions/5/QtPrintSupport)
+ _QTDBUS = $$quote(@rpath/QtDBus.framework/Versions/5/QtDBus)
isEmpty(TARGET_ARCH) {
_INSTALL_NAME_TOOL = install_name_tool
} else {
@@ -384,14 +386,14 @@
$$_INSTALL_NAME_TOOL -change $$_QTGUI $$_BASE/QtGui
$$_LIBDIR/QtPrintSupport && \
$$_INSTALL_NAME_TOOL -change $$_QTWIDGETS $$_BASE/QtWidgets
$$_LIBDIR/QtPrintSupport && \
$$_INSTALL_NAME_TOOL -id $$_BASE/QtPrintSupport
$$_LIBDIR/QtPrintSupport && \
+ $$_INSTALL_NAME_TOOL -change $$_QTCORE $$_BASE/QtCore $$_LIBDIR/QtDBus
&& \
+ $$_INSTALL_NAME_TOOL -id $$_BASE/QtDBus $$_LIBDIR/QtDBus && \
$$_INSTALL_NAME_TOOL -change $$_QTCORE $$_BASE/QtCore
$$_PLUGINDIR/imageformats/libqmng.dylib && \
$$_INSTALL_NAME_TOOL -change $$_QTGUI $$_BASE/QtGui
$$_PLUGINDIR/imageformats/libqmng.dylib && \
- $$_INSTALL_NAME_TOOL -change $$_QTCORE $$_BASE/QtCore
$$_PLUGINDIR/accessible/libqtaccessiblewidgets.dylib && \
- $$_INSTALL_NAME_TOOL -change $$_QTWIDGETS $$_BASE/QtWidgets
$$_PLUGINDIR/accessible/libqtaccessiblewidgets.dylib && \
- $$_INSTALL_NAME_TOOL -change $$_QTGUI $$_BASE/QtGui
$$_PLUGINDIR/accessible/libqtaccessiblewidgets.dylib && \
$$_INSTALL_NAME_TOOL -change $$_QTCORE $$_BASE/QtCore
$$_PLUGINDIR/platforms/libqcocoa.dylib && \
$$_INSTALL_NAME_TOOL -change $$_QTWIDGETS $$_BASE/QtWidgets
$$_PLUGINDIR/platforms/libqcocoa.dylib && \
$$_INSTALL_NAME_TOOL -change $$_QTGUI $$_BASE/QtGui
$$_PLUGINDIR/platforms/libqcocoa.dylib && \
+ $$_INSTALL_NAME_TOOL -change $$_QTDBUS $$_BASE/QtDBus
$$_PLUGINDIR/platforms/libqcocoa.dylib && \
$$_INSTALL_NAME_TOOL -change $$_QTPRINTSUPPORT $$_BASE/QtPrintSupport
$$_PLUGINDIR/platforms/libqcocoa.dylib)
QMAKE_POST_LINK += $$quote( && \
@@ -403,12 +405,12 @@
build_installer {
# the productbuild path doesn't work pre 10.8
for_store {
- _INSTALLER_CMD = "productbuild --sign
\'$$INSTALLER_SIGN_IDENTITY\' --component $${DESTDIR}/$${TARGET_MAC}.app
/Applications/ $${DESTDIR}/$${TARGET_MAC}-$${VERSION}.pkg"
+ _INSTALLER_CMD = "productbuild --sign
\'$$INSTALLER_SIGN_IDENTITY\' --component $${DESTDIR}/$${TARGET_MAC}.app
/Applications/ $${DESTDIR}/yubikey-personalization-gui-$${VERSION}.pkg"
} else {
_INSTALLER_CMD = "rm -rf $${DESTDIR}/temp && \
mkdir -p $${DESTDIR}/temp/ && \
cp -R $${DESTDIR}/$${TARGET_MAC}.app $${DESTDIR}/temp && \
- pkgbuild --sign \'$$INSTALLER_SIGN_IDENTITY\' --root
${DESTDIR}/temp/ --component-plist ../resources/mac/installer.plist
--install-location '/Applications/' $${DESTDIR}/$${TARGET_MAC}-$${VERSION}.pkg"
+ pkgbuild --sign \'$$INSTALLER_SIGN_IDENTITY\' --root
${DESTDIR}/temp/ --component-plist ../resources/mac/installer.plist
--install-location '/Applications/'
$${DESTDIR}/yubikey-personalization-gui-$${VERSION}.pkg"
}
QMAKE_POST_LINK += $$quote( && \
codesign --deep -s \'$$PACKAGE_SIGN_IDENTITY\'
$${DESTDIR}/$${TARGET_MAC}.app \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/src/ui/mainwindow.cpp
new/yubikey-personalization-gui-3.1.24/src/ui/mainwindow.cpp
--- old/yubikey-personalization-gui-3.1.23/src/ui/mainwindow.cpp
2015-10-01 12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/src/ui/mainwindow.cpp
2016-01-04 12:15:45.000000000 +0100
@@ -391,14 +391,14 @@
QPixmap pixmap;
QMovie *movie = new QMovie();
- if(version < YK_VERSION(2,0,0)) {
+ if(version == 0) {
+ pixmap.load(":/res/images/blank.png");
+ } else if(version < YK_VERSION(2,0,0)) {
pixmap.load(":/res/images/v1-3-not-animated.png");
} else if(version < YK_VERSION(2,1,4)) {
movie->setFileName(":/res/images/V2-0-2-1-animated.mng");
} else if(version < YK_VERSION(2,2,0)) { // NEO Beta
pixmap.load(":/res/images/neo_transparent.png");
- } else if(version % 10 == 9){
- pixmap.load(":/res/images/yubikey_devel.png");
} else if(version < YK_VERSION(2,3,0)){
movie->setFileName(":/res/images/v2-2-animated.mng");
} else if(version < YK_VERSION(3,0,0)){
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-personalization-gui-3.1.23/src/version.h
new/yubikey-personalization-gui-3.1.24/src/version.h
--- old/yubikey-personalization-gui-3.1.23/src/version.h 2015-10-01
12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/src/version.h 2016-01-04
12:15:45.000000000 +0100
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2011-2015 Yubico AB. All rights reserved.
+Copyright (C) 2011-2016 Yubico AB. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -34,7 +34,7 @@
#define VER_FILEDESCRIPTION_STR "YubiKey Personalization Tool"
#define VER_INTERNALNAME_STR "YKPersonalization"
-#define VER_LEGALCOPYRIGHT "Copyright © 2011-2015 Yubico"
+#define VER_LEGALCOPYRIGHT "Copyright © 2011-2016 Yubico"
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"
#define VER_ORIGINALFILENAME_STR "YKPersonalization.exe"
#define VER_PRODUCTNAME_STR "YKPersonalization"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/tests/yubikeyutiltest.cpp
new/yubikey-personalization-gui-3.1.24/tests/yubikeyutiltest.cpp
--- old/yubikey-personalization-gui-3.1.23/tests/yubikeyutiltest.cpp
2015-10-01 12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/tests/yubikeyutiltest.cpp
2016-01-04 12:15:45.000000000 +0100
@@ -73,6 +73,16 @@
QCOMPARE(result, QString("000000"));
}
+void TestYubikeyUtil::testGetNextHex4() {
+ QString result = YubiKeyUtil::getNextHex(6, " 1 fff f f ",
GEN_SCHEME_INCR);
+ QCOMPARE(result, QString("200000"));
+}
+
+void TestYubikeyUtil::testGetNextHexRand() {
+ QString result = YubiKeyUtil::getNextHex(6, "cccccc", GEN_SCHEME_RAND);
+ QVERIFY(result != "");
+}
+
void TestYubikeyUtil::testGetNextModhex1() {
QString result = YubiKeyUtil::getNextModhex(6, "cccccc", GEN_SCHEME_INCR);
QCOMPARE(result, QString("cccccb"));
@@ -90,7 +100,17 @@
void TestYubikeyUtil::testGetNextModhex4() {
QString result = YubiKeyUtil::getNextModhex(6, "vvvvv", GEN_SCHEME_INCR);
- QCOMPARE(result, QString(""));
+ QCOMPARE(result, QString("vvvvvb"));
+}
+
+void TestYubikeyUtil::testGetNextModhex5() {
+ QString result = YubiKeyUtil::getNextModhex(6, " cc cc cc ",
GEN_SCHEME_INCR);
+ QCOMPARE(result, QString("cccccb"));
+}
+
+void TestYubikeyUtil::testGetNextModhexRand() {
+ QString result = YubiKeyUtil::getNextModhex(6, "bbbbbb", GEN_SCHEME_RAND);
+ QVERIFY(result != "");
}
void TestYubikeyUtil::testGenerateRandomHex() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-personalization-gui-3.1.23/tests/yubikeyutiltest.h
new/yubikey-personalization-gui-3.1.24/tests/yubikeyutiltest.h
--- old/yubikey-personalization-gui-3.1.23/tests/yubikeyutiltest.h
2015-10-01 12:32:44.000000000 +0200
+++ new/yubikey-personalization-gui-3.1.24/tests/yubikeyutiltest.h
2016-01-04 12:15:45.000000000 +0100
@@ -39,10 +39,14 @@
void testGetNextHex1();
void testGetNextHex2();
void testGetNextHex3();
+ void testGetNextHex4();
+ void testGetNextHexRand();
void testGetNextModhex1();
void testGetNextModhex2();
void testGetNextModhex3();
void testGetNextModhex4();
+ void testGetNextModhex5();
+ void testGetNextModhexRand();
void testGenerateRandomHex();
void testGenerateRandomModhex();
};
