Hello community, here is the log from the commit of package ykpers for openSUSE:Factory checked in at 2015-10-02 09:23:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ykpers (Old) and /work/SRC/openSUSE:Factory/.ykpers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ykpers" Changes: -------- --- /work/SRC/openSUSE:Factory/ykpers/ykpers.changes 2015-05-11 19:48:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ykpers.new/ykpers.changes 2015-10-02 09:23:55.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 29 14:19:49 UTC 2015 - [email protected] + +- Version 1.17.2 (released 2015-09-22) + - Let _yk_write() return an error if yk_wait_for_key_status() fails. + - Fix a mistake in help, fixed is up to 16 bytes, 32 characters. + - Add 4.2 as supported firmware. + +------------------------------------------------------------------- @@ -13,0 +22,11 @@ + +------------------------------------------------------------------- +Wed Apr 1 14:02:13 UTC 2015 - [email protected] + +- Version 1.17.1 (released 2015-04-01) + - Fixup of 1.17.0 + +- Version 1.17.0 (released 2015-04-01) + - add yk_get_capabilities() to fetch capabilities. + - add -c to ykinfo to fetch capabilities. + - whitelist firmware 4.1.x Old: ---- ykpers-1.17.1.tar.gz ykpers-1.17.1.tar.gz.sig New: ---- ykpers-1.17.2.tar.gz ykpers-1.17.2.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ykpers.spec ++++++ --- /var/tmp/diff_new_pack.DM1Lpk/_old 2015-10-02 09:23:56.000000000 +0200 +++ /var/tmp/diff_new_pack.DM1Lpk/_new 2015-10-02 09:23:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: ykpers -Version: 1.17.1 +Version: 1.17.2 Release: 0 Summary: Provides a reference implementation for configuration of YubiKeys License: BSD-2-Clause @@ -31,8 +31,8 @@ BuildRequires: libyubikey-devel => 1.12 BuildRequires: pkg-config BuildRequires: pkgconfig(json-c) => 0.10 -BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(udev) %description Yubico's YubiKey can be re-programmed. This project's purpose is to provide a reference implementation for configuration of YubiKey's. ++++++ ykpers-1.17.1.tar.gz -> ykpers-1.17.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/.travis.yml new/ykpers-1.17.2/.travis.yml --- old/ykpers-1.17.1/.travis.yml 2015-03-27 11:12:30.000000000 +0100 +++ new/ykpers-1.17.2/.travis.yml 2015-05-05 17:15:32.000000000 +0200 @@ -10,7 +10,7 @@ script: - ./build-and-test.sh before_install: - - sudo apt-get update -qq + - sudo apt-get update -qq || true - sudo apt-get remove -qq -y $REMOVE - sudo apt-get autoremove -qq - sudo apt-get install -qq -y libyubikey-dev $EXTRA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/ChangeLog new/ykpers-1.17.2/ChangeLog --- old/ykpers-1.17.1/ChangeLog 2015-04-01 13:23:36.000000000 +0200 +++ new/ykpers-1.17.2/ChangeLog 2015-09-22 15:43:52.000000000 +0200 @@ -1,3 +1,60 @@ +2015-09-22 Klas Lindfors <[email protected]> + + * configure.ac: fixup + +2015-09-22 Klas Lindfors <[email protected]> + + * NEWS: NEWS for 1.17.2 + +2015-09-22 Klas Lindfors <[email protected]> + + * configure.ac: bump version and libtool stuff + +2015-09-16 Klas Lindfors <[email protected]> + + * ykpersonalize.c: Warn if the user is putting the device in a + non-OTP mode + +2015-09-15 Klas Lindfors <[email protected]> + + * tests/test_yk_utilities.c, ykcore/ykcore.c: add 4.2 as supported + firmware + +2015-09-04 Klas Lindfors <[email protected]> + + * tests/test_yk_utilities.c: test for version with two digit build + number + +2015-08-21 Henrik Stråth <[email protected]> + + * README: Update README + +2015-08-19 Klas Lindfors <[email protected]> + + * ykpers-args.c: fix a mistake in help, fixed is up to 16 bytes, 32 + characters. + +2015-08-12 Klas Lindfors <[email protected]> + + * README: add slot so examples in README are correct this behavorial change was added in 1.7.0 (in 2012) fixes #60 + +2015-08-12 Klas Lindfors <[email protected]> + + * Makefile.am: change libhmac dependency to be relative fixes #61 + +2015-05-05 Klas Lindfors <[email protected]> + + * .travis.yml: ignore errors from apt-get update for travis + +2015-05-05 Klas Lindfors <[email protected]> + + * ykcore/ykcore.c: drop old commented code + +2015-05-05 Klas Lindfors <[email protected]> + + * ykcore/ykcore.c: let _yk_write() return an error if + yk_wait_for_key_status() fails + 2015-04-01 Klas Lindfors <[email protected]> * NEWS, configure.ac: NEWS and version for 1.17.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/Makefile.am new/ykpers-1.17.2/Makefile.am --- old/ykpers-1.17.1/Makefile.am 2015-03-27 11:12:30.000000000 +0100 +++ new/ykpers-1.17.2/Makefile.am 2015-08-12 10:14:18.000000000 +0200 @@ -58,7 +58,7 @@ endif libykpers_1_la_SOURCES += ykpers_lcl.h ykpers-json.h ykpers_lcl.c libykpers_1_la_SOURCES += ykpers-1.pc.in libykpers-1.map -libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la libhmac.la $(libjson_LIBS) +libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la ./libhmac.la $(libjson_LIBS) libykpers_1_la_LDFLAGS = -no-undefined \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) EXTRA_libykpers_1_la_DEPENDENCIES = libykpers-1.map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/Makefile.in new/ykpers-1.17.2/Makefile.in --- old/ykpers-1.17.1/Makefile.in 2015-04-01 13:23:18.000000000 +0200 +++ new/ykpers-1.17.2/Makefile.in 2015-09-22 15:43:47.000000000 +0200 @@ -197,7 +197,7 @@ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__DEPENDENCIES_1 = libykpers_1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - ./ykcore/libykcore.la libhmac.la $(am__DEPENDENCIES_1) + ./ykcore/libykcore.la ./libhmac.la $(am__DEPENDENCIES_1) am__libykpers_1_la_SOURCES_DIST = ykpers.c ykpers-version.c ykpbkdf2.c \ ykpers-json.c ykpers-nojson.c ykpers_lcl.h ykpers-json.h \ ykpers_lcl.c ykpers-1.pc.in libykpers-1.map @@ -515,7 +515,7 @@ libykpers_1_la_SOURCES = ykpers.c ykpers-version.c ykpbkdf2.c \ $(am__append_1) $(am__append_2) ykpers_lcl.h ykpers-json.h \ ykpers_lcl.c ykpers-1.pc.in libykpers-1.map -libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la libhmac.la $(libjson_LIBS) +libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la ./libhmac.la $(libjson_LIBS) libykpers_1_la_LDFLAGS = -no-undefined -version-info \ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(am__append_3) \ $(am__append_4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/NEWS new/ykpers-1.17.2/NEWS --- old/ykpers-1.17.1/NEWS 2015-04-01 13:22:53.000000000 +0200 +++ new/ykpers-1.17.2/NEWS 2015-09-22 15:31:51.000000000 +0200 @@ -1,5 +1,13 @@ Yubikey-personalize NEWS -- History of user-visible changes. -*- outline -*- +* Version 1.17.2 (released 2015-09-22) + +** Let _yk_write() return an error if yk_wait_for_key_status() fails. + +** Fix a mistake in help, fixed is up to 16 bytes, 32 characters. + +** Add 4.2 as supported firmware. + * Version 1.17.1 (released 2015-04-01) ** Fixup of 1.17.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/README new/ykpers-1.17.2/README --- old/ykpers-1.17.1/README 2014-09-23 13:28:18.000000000 +0200 +++ new/ykpers-1.17.2/README 2015-09-04 12:47:33.000000000 +0200 @@ -117,7 +117,7 @@ an all-zero AES key and a dummy prefix: ----------- -$ ./ykpersonalize -ofixed=cccccccccccc -a00000000000000000000000000000000 +$ ./ykpersonalize -1 -ofixed=cccccccccccc -a00000000000000000000000000000000 Firmware version 1.3.1 Touch level 9840 Program sequence 10 Configuration data to be written to key configuration 1: @@ -168,7 +168,7 @@ as follows: ----------- -$ ./ykpersonalize -ofixed=cccccccccccc -a00000000000000000000000000000000 -ostatic-ticket +$ ./ykpersonalize -1 -ofixed=cccccccccccc -a00000000000000000000000000000000 -ostatic-ticket Firmware version 1.3.1 Touch level 9856 Program sequence 11 Configuration data to be written to key configuration 1: @@ -189,7 +189,7 @@ YubiKey 2.0 only!) as follows: ----------- -$ ./ykpersonalize -ofixed=cccccccccccc -a00000000000000000000000000000000 -ostatic-ticket -ostrong-pw1 -ostrong-pw2 +$ ./ykpersonalize -1 -ofixed=cccccccccccc -a00000000000000000000000000000000 -ostatic-ticket -ostrong-pw1 -ostrong-pw2 Firmware version 2.0.0 Touch level 1792 Program sequence 3 Configuration data to be written to key configuration 1: @@ -208,7 +208,7 @@ defaults to be the static key configuration: ----------- -$ ./ykpersonalize -ofixed=cccccccccccc -a00000000000000000000000000000000 -2 +$ ./ykpersonalize -2 -ofixed=cccccccccccc -a00000000000000000000000000000000 Firmware version 2.0.0 Touch level 1792 Program sequence 3 Configuration data to be written to key configuration 2: @@ -227,7 +227,7 @@ reprogramming it), you use the -oaccess= flag as follows: ----------- -$ ./ykpersonalize -ofixed=vvvecdcedvjj -a00000000000000000000000000000000 -oaccess=001100001100 +$ ./ykpersonalize -1 -ofixed=vvvecdcedvjj -a00000000000000000000000000000000 -oaccess=001100001100 Firmware version 2.0.0 Touch level 1792 Program sequence 3 Configuration data to be written to key configuration 1: @@ -246,7 +246,7 @@ -cXXX.. flag as follows: ----------- -$ ./ykpersonalize -c001100001100 -ofixed=vvvecdcedvjj -a00000000000000000000000000000000 -oaccess=001100223300 +$ ./ykpersonalize -1 -c001100001100 -ofixed=vvvecdcedvjj -a00000000000000000000000000000000 -oaccess=001100223300 Firmware version 2.0.0 Touch level 1792 Program sequence 3 Configuration data to be written to key configuration 1: @@ -265,7 +265,7 @@ to zeros. For example: ----------- -$ ./ykpersonalize -c001100001133 -ofixed=vvvecdcedvjj -a00000000000000000000000000000003 -oaccess=000000000000 +$ ./ykpersonalize -1 -c001100001133 -ofixed=vvvecdcedvjj -a00000000000000000000000000000003 -oaccess=000000000000 Firmware version 2.0.0 Touch level 1792 Program sequence 7 Configuration data to be written to key configuration 1: @@ -279,9 +279,3 @@ Commit? (y/n) [n]: y $ ----------- - -Feedback --------- - -See the Google Group yubico-devel: -http://groups.google.com/group/yubico-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/configure new/ykpers-1.17.2/configure --- old/ykpers-1.17.1/configure 2015-04-01 13:23:18.000000000 +0200 +++ new/ykpers-1.17.2/configure 2015-09-22 15:43:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yubikey-personalization 1.17.1. +# Generated by GNU Autoconf 2.69 for yubikey-personalization 1.17.2. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yubikey-personalization' PACKAGE_TARNAME='ykpers' -PACKAGE_VERSION='1.17.1' -PACKAGE_STRING='yubikey-personalization 1.17.1' +PACKAGE_VERSION='1.17.2' +PACKAGE_STRING='yubikey-personalization 1.17.2' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='https://developers.yubico.com/yubikey-personalization/' @@ -1371,7 +1371,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yubikey-personalization 1.17.1 to adapt to many kinds of systems. +\`configure' configures yubikey-personalization 1.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1441,7 +1441,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yubikey-personalization 1.17.1:";; + short | recursive ) echo "Configuration of yubikey-personalization 1.17.2:";; esac cat <<\_ACEOF @@ -1573,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yubikey-personalization configure 1.17.1 +yubikey-personalization configure 1.17.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1851,7 +1851,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yubikey-personalization $as_me 1.17.1, which was +It was created by yubikey-personalization $as_me 1.17.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2236,7 +2236,7 @@ # Interfaces removed: AGE=0 LT_CURRENT=18 -LT_REVISION=1 +LT_REVISION=2 LT_AGE=17 @@ -2727,7 +2727,7 @@ # Define the identity of the package. PACKAGE='ykpers' - VERSION='1.17.1' + VERSION='1.17.2' cat >>confdefs.h <<_ACEOF @@ -15941,7 +15941,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yubikey-personalization $as_me 1.17.1, which was +This file was extended by yubikey-personalization $as_me 1.17.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15999,7 +15999,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yubikey-personalization config.status 1.17.1 +yubikey-personalization config.status 1.17.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/configure.ac new/ykpers-1.17.2/configure.ac --- old/ykpers-1.17.1/configure.ac 2015-04-01 13:23:06.000000000 +0200 +++ new/ykpers-1.17.2/configure.ac 2015-09-22 15:43:17.000000000 +0200 @@ -26,7 +26,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([yubikey-personalization], [1.17.1], +AC_INIT([yubikey-personalization], [1.17.2], [[email protected]], [ykpers], [https://developers.yubico.com/yubikey-personalization/]) AC_CONFIG_AUX_DIR([build-aux]) @@ -37,7 +37,7 @@ # Interfaces added: AGE++ # Interfaces removed: AGE=0 AC_SUBST(LT_CURRENT, 18) -AC_SUBST(LT_REVISION, 1) +AC_SUBST(LT_REVISION, 2) AC_SUBST(LT_AGE, 17) AM_INIT_AUTOMAKE([1.11.3 -Wall -Werror]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/tests/test_yk_utilities.c new/ykpers-1.17.2/tests/test_yk_utilities.c --- old/ykpers-1.17.1/tests/test_yk_utilities.c 2015-03-27 11:12:30.000000000 +0100 +++ new/ykpers-1.17.2/tests/test_yk_utilities.c 2015-09-15 14:16:19.000000000 +0200 @@ -63,7 +63,9 @@ {3,5,1,false}, {4,0,1,true}, {4,1,2,true}, - {4,2,1,false}, + {4,1,10,true}, + {4,2,1,true}, + {4,3,7,false}, {5,0,0,false}, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/ykcore/ykcore.c new/ykpers-1.17.2/ykcore/ykcore.c --- old/ykpers-1.17.1/ykcore/ykcore.c 2015-04-01 12:43:22.000000000 +0200 +++ new/ykpers-1.17.2/ykcore/ykcore.c 2015-09-15 14:15:40.000000000 +0200 @@ -124,7 +124,7 @@ return 1; break; case 4: - if(st->versionMinor <= 1) + if(st->versionMinor <= 2) return 1; break; } @@ -234,7 +234,8 @@ * want to get the bytes in the status message, but when writing configuration * we don't expect any data back. */ - yk_wait_for_key_status(yk, yk_cmd, 0, WAIT_FOR_WRITE_FLAG, false, SLOT_WRITE_FLAG, NULL); + if(!yk_wait_for_key_status(yk, yk_cmd, 0, WAIT_FOR_WRITE_FLAG, false, SLOT_WRITE_FLAG, NULL)) + return 0; /* Verify update */ @@ -677,12 +678,6 @@ ptr = (unsigned char *) &frame; end = (unsigned char *) &frame + sizeof(frame); - /* Initial check that the YubiKey is in a state where it will accept - * a write. - * - if (! yk_wait_for_key_status(yk, slot, 0, 1000, false, SLOT_WRITE_FLAG, NULL)) - return 0; - */ #ifdef YK_DEBUG fprintf(stderr, "YK_DEBUG: Write %i bytes to YubiKey :\n", bufcount); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/ykpers-args.c new/ykpers-1.17.2/ykpers-args.c --- old/ykpers-1.17.1/ykpers-args.c 2015-03-27 11:12:30.000000000 +0100 +++ new/ykpers-1.17.2/ykpers-args.c 2015-08-19 09:06:37.000000000 +0200 @@ -81,7 +81,7 @@ " YubiKey 3.0 and newer only\n" "-oOPTION change configuration option. Possible OPTION arguments are:\n" " fixed=xxxxxxxxxxx The public identity of key, in MODHEX.\n" -" This is 0-16 characters long.\n" +" This is 0-32 characters long.\n" " uid=xxxxxx The uid part of the generated ticket, in HEX.\n" " MUST be 12 characters long.\n" " access=xxxxxxxxxxx New access code to set, in HEX.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/ykpers-version.h new/ykpers-1.17.2/ykpers-version.h --- old/ykpers-1.17.1/ykpers-version.h 2015-04-01 13:23:23.000000000 +0200 +++ new/ykpers-1.17.2/ykpers-version.h 2015-09-22 15:43:51.000000000 +0200 @@ -42,7 +42,7 @@ * version number. Used together with ykpers_check_version() to verify * header file and run-time library consistency. */ -#define YKPERS_VERSION_STRING "1.17.1" +#define YKPERS_VERSION_STRING "1.17.2" /** * YKPERS_VERSION_NUMBER @@ -52,7 +52,7 @@ * this symbol will have the value 0x01020300. The last two digits * are only used between public releases, and will otherwise be 00. */ -#define YKPERS_VERSION_NUMBER 0x011101 +#define YKPERS_VERSION_NUMBER 0x011102 /** * YKPERS_VERSION_MAJOR @@ -79,7 +79,7 @@ * level of the header file version number. For example, when the * header version is 1.2.3 this symbol will be 3. */ -#define YKPERS_VERSION_PATCH 1 +#define YKPERS_VERSION_PATCH 2 const char *ykpers_check_version (const char *req_version); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ykpers-1.17.1/ykpersonalize.c new/ykpers-1.17.2/ykpersonalize.c --- old/ykpers-1.17.1/ykpersonalize.c 2015-03-27 11:12:30.000000000 +0100 +++ new/ykpers-1.17.2/ykpersonalize.c 2015-09-16 15:10:45.000000000 +0200 @@ -354,6 +354,30 @@ } } + if((usb_mode & 0xf) == MODE_CCID || (usb_mode & 0xf) == MODE_U2F || + (usb_mode & 0xf) == MODE_U2F_CCID) { + fprintf(stderr, "WARNING: This tool will not be able to switch back from the selected mode, really commit? (y/n) [n]: "); + if (autocommit) { + strcpy(commitbuf, "yes"); + puts(commitbuf); + } else { + if (!fgets(commitbuf, sizeof(commitbuf), stdin)) + { + perror ("fgets"); + goto err; + } + } + commitlen = strlen(commitbuf); + if (commitbuf[commitlen - 1] == '\n') + commitbuf[commitlen - 1] = '\0'; + if (strcmp(commitbuf, "y") != 0 + || strcmp(commitbuf, "yes") != 0) { + exit_code = 0; + error = false; + goto err; + } + } + if(!yk_write_device_config(yk, device_config)) { if(verbose) printf(" failure\n");
