Hello community, here is the log from the commit of package libykneomgr for openSUSE:Factory checked in at 2015-10-08 08:24:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libykneomgr (Old) and /work/SRC/openSUSE:Factory/.libykneomgr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libykneomgr" Changes: -------- --- /work/SRC/openSUSE:Factory/libykneomgr/libykneomgr.changes 2015-05-02 21:36:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libykneomgr.new/libykneomgr.changes 2015-10-08 08:24:18.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 1 20:37:58 UTC 2015 - [email protected] + +- Version 0.1.8 (released 2015-10-01) + - Add documentation for mode arguments. + - Don’t treat applet selection error as a critical error. + +------------------------------------------------------------------ Old: ---- libykneomgr-0.1.7.tar.gz New: ---- libykneomgr-0.1.8.tar.gz libykneomgr-0.1.8.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libykneomgr.spec ++++++ --- /var/tmp/diff_new_pack.JL2Wen/_old 2015-10-08 08:24:19.000000000 +0200 +++ /var/tmp/diff_new_pack.JL2Wen/_new 2015-10-08 08:24:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: libykneomgr -Version: 0.1.7 +Version: 0.1.8 Release: 0 Summary: Yubico YubiKey NEO CCID Manager License: LGPL-3.0+ @@ -25,6 +25,7 @@ Url: https://developers.yubico.com/ # a different tarball is available from github. It will not build with this spec file Source0: https://developers.yubico.com/libykneomgr/Releases/%{name}-%{version}.tar.gz +Source1: https://developers.yubico.com/libykneomgr/Releases/%{name}-%{version}.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: help2man BuildRequires: libzip-devel ++++++ libykneomgr-0.1.7.tar.gz -> libykneomgr-0.1.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/ChangeLog new/libykneomgr-0.1.8/ChangeLog --- old/libykneomgr-0.1.7/ChangeLog 2015-04-09 13:22:33.000000000 +0200 +++ new/libykneomgr-0.1.8/ChangeLog 2015-10-01 15:08:04.000000000 +0200 @@ -1,3 +1,36 @@ +2015-10-01 Klas Lindfors <[email protected]> + + * NEWS: NEWS for 0.1.8 + +2015-09-16 Klas Lindfors <[email protected]> + + * configure.ac: improve error when no pcsc library is found previously auto-selected windows and got weird error for that + +2015-09-01 Klas Lindfors <[email protected]> + + * lib/devs.c: don't treat applet selection error as a critical error this allows the library to still be used even if the yubikey applet + isn't present + +2015-08-10 Klas Lindfors <[email protected]> + + * src/cmdline.ggo: add documentation for mode arguments + +2015-04-28 Dain Nilsson <[email protected]> + + * README.adoc: Added README.adoc symlink for Github. + +2015-04-28 Dain Nilsson <[email protected]> + + * README: Added OpenPGP security advisory notice. + +2015-04-09 Klas Lindfors <[email protected]> + + * macosx.mk: use curl for download on mac + +2015-04-09 Klas Lindfors <[email protected]> + + * NEWS, configure.ac: bump versions + 2015-04-09 Klas Lindfors <[email protected]> * NEWS: NEWS for 0.1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/NEWS new/libykneomgr-0.1.8/NEWS --- old/libykneomgr-0.1.7/NEWS 2015-04-09 13:21:37.000000000 +0200 +++ new/libykneomgr-0.1.8/NEWS 2015-10-01 15:07:25.000000000 +0200 @@ -1,5 +1,11 @@ libykneomgr NEWS -- History of user-visible changes. -*- outline -*- +* Version 0.1.8 (released 2015-10-01) + +** Add documentation for mode arguments. + +** Don't treat applet selection error as a critical error. + * Version 0.1.7 (released 2015-04-09) ** Check programming sequence when changing mode. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/README new/libykneomgr-0.1.8/README --- old/libykneomgr-0.1.7/README 2015-01-08 14:34:05.000000000 +0100 +++ new/libykneomgr-0.1.8/README 2015-07-03 14:22:12.000000000 +0200 @@ -13,6 +13,12 @@ For more information about Yubico and the YubiKey, see: https://www.yubico.com/ +[IMPORTANT] +==== +Yubico has learned of a security issue with the OpenPGP Card applet project that is used in the YubiKey NEO. This vulnerability applies to you only if you are using OpenPGP, and you have the OpenPGP applet version 1.0.9 or earlier. +link:https://developers.yubico.com/ykneo-openpgp/SecurityAdvisory%202015-04-14.html[SecurityAdvisory 2015-04-14] +==== + License ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/config.h.in new/libykneomgr-0.1.8/config.h.in --- old/libykneomgr-0.1.7/config.h.in 2015-03-20 09:30:23.000000000 +0100 +++ new/libykneomgr-0.1.8/config.h.in 2015-10-01 15:07:42.000000000 +0200 @@ -81,6 +81,9 @@ /* Define to 1 if you have the <wchar.h> header file. */ #undef HAVE_WCHAR_H +/* Define to 1 if you have the <winscard.h> header file. */ +#undef HAVE_WINSCARD_H + /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/configure new/libykneomgr-0.1.8/configure --- old/libykneomgr-0.1.7/configure 2015-03-20 09:30:23.000000000 +0100 +++ new/libykneomgr-0.1.8/configure 2015-09-16 16:20:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libykneomgr 0.1.7. +# Generated by GNU Autoconf 2.69 for libykneomgr 0.1.8. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libykneomgr' PACKAGE_TARNAME='libykneomgr' -PACKAGE_VERSION='0.1.7' -PACKAGE_STRING='libykneomgr 0.1.7' +PACKAGE_VERSION='0.1.8' +PACKAGE_STRING='libykneomgr 0.1.8' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1419,7 +1419,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 libykneomgr 0.1.7 to adapt to many kinds of systems. +\`configure' configures libykneomgr 0.1.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1489,7 +1489,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libykneomgr 0.1.7:";; + short | recursive ) echo "Configuration of libykneomgr 0.1.8:";; esac cat <<\_ACEOF @@ -1622,7 +1622,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libykneomgr configure 0.1.7 +libykneomgr configure 0.1.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2228,7 +2228,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libykneomgr $as_me 0.1.7, which was +It was created by libykneomgr $as_me 0.1.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2614,7 +2614,7 @@ # http://www.gnu.org/s/libtool/manual/html_node/Updating-version-info.html LT_CURRENT=1 -LT_REVISION=7 +LT_REVISION=8 LT_AGE=1 @@ -3105,7 +3105,7 @@ # Define the identity of the package. PACKAGE='libykneomgr' - VERSION='0.1.7' + VERSION='0.1.8' cat >>confdefs.h <<_ACEOF @@ -13132,16 +13132,31 @@ done + for ac_header in winscard.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winscard.h" "ac_cv_header_winscard_h" "$ac_includes_default" +if test "x$ac_cv_header_winscard_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSCARD_H 1 +_ACEOF + +fi + +done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking between Mac/Windows winscard" >&5 $as_echo_n "checking between Mac/Windows winscard... " >&6; } if test "x$ac_cv_header_PCSC_winscard_h" = xyes; then with_backend=macscard { $as_echo "$as_me:${as_lineno-$LINENO}: result: Mac" >&5 $as_echo "Mac" >&6; } - else + elif test "x$ac_cv_header_winscard_h" = xyes; then with_backend=winscard { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5 $as_echo "Windows" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -13985,7 +14000,7 @@ $as_echo "#define BACKEND_PCSC 1" >>confdefs.h else - as_fn_error $? "cannot find PCSC/winscard library/headers" "$LINENO" 5 + as_fn_error $? "cannot find PCSC library" "$LINENO" 5 fi if test x$with_backend = xglobalplatform; then @@ -16586,7 +16601,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libykneomgr $as_me 0.1.7, which was +This file was extended by libykneomgr $as_me 0.1.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16656,7 +16671,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libykneomgr config.status 0.1.7 +libykneomgr config.status 0.1.8 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/libykneomgr-0.1.7/configure.ac new/libykneomgr-0.1.8/configure.ac --- old/libykneomgr-0.1.7/configure.ac 2014-09-16 09:55:16.000000000 +0200 +++ new/libykneomgr-0.1.8/configure.ac 2015-09-16 16:20:36.000000000 +0200 @@ -13,14 +13,14 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -AC_INIT([libykneomgr], [0.1.7], [[email protected]]) +AC_INIT([libykneomgr], [0.1.8], [[email protected]]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) # http://www.gnu.org/s/libtool/manual/html_node/Updating-version-info.html AC_SUBST([LT_CURRENT], 1) -AC_SUBST([LT_REVISION], 7) +AC_SUBST([LT_REVISION], 8) AC_SUBST([LT_AGE], 1) AM_INIT_AUTOMAKE([-Wall -Werror]) @@ -64,13 +64,16 @@ if test "x$with_backend" = xcheck; then AC_CHECK_HEADERS([PCSC/winscard.h]) + AC_CHECK_HEADERS([winscard.h]) AC_MSG_CHECKING([between Mac/Windows winscard]) if test "x$ac_cv_header_PCSC_winscard_h" = xyes; then with_backend=macscard AC_MSG_RESULT([Mac]) - else + elif test "x$ac_cv_header_winscard_h" = xyes; then with_backend=winscard AC_MSG_RESULT([Windows]) + else + AC_MSG_RESULT([no]) fi fi @@ -104,7 +107,7 @@ || test "x$with_backend" = xmacscard; then AC_DEFINE([BACKEND_PCSC], 1, [Define to 1 if you the PCSC backend.]) else - AC_MSG_ERROR([cannot find PCSC/winscard library/headers]) + AC_MSG_ERROR([cannot find PCSC library]) fi AM_CONDITIONAL([BACKEND_GLOBALPLATFORM], test x$with_backend = xglobalplatform) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/lib/devs.c new/libykneomgr-0.1.8/lib/devs.c --- old/libykneomgr-0.1.7/lib/devs.c 2015-04-09 13:21:45.000000000 +0200 +++ new/libykneomgr-0.1.8/lib/devs.c 2015-10-01 15:07:28.000000000 +0200 @@ -122,53 +122,55 @@ { if (debug) printf ("YubiKey NEO applet selection failed\n"); - return YKNEOMGR_NO_DEVICE; } - - _update_status (dev, recvAPDU, recvAPDULen); - dev->mode = recvAPDU[6]; - dev->crTimeout = recvAPDU[7]; - dev->autoEjectTime = GETU16 (&recvAPDU[8]); - - if (debug) + else { - printf ("versionMajor %d\n", dev->versionMajor); - printf ("versionMinor %d\n", dev->versionMinor); - printf ("versionBuild %d\n", dev->versionBuild); - printf ("pgmSeq %d\n", dev->pgmSeq); - printf ("touchLevel %d\n", dev->touchLevel); - printf ("mode %02x\n", dev->mode); - printf ("crTimeout %d\n", dev->crTimeout); - printf ("autoEjectTime %d\n", dev->autoEjectTime); - } - - memcpy (buf, "\x00\x01\x10\x00", 4); + _update_status (dev, recvAPDU, recvAPDULen); + dev->mode = recvAPDU[6]; + dev->crTimeout = recvAPDU[7]; + dev->autoEjectTime = GETU16 (&recvAPDU[8]); - rc = backend_apdu (dev, buf, 4, recvAPDU, &recvAPDULen); - if (rc != YKNEOMGR_OK) - return rc; - - if (!((recvAPDULen == 2 && recvAPDU[0] == 0x90 && recvAPDU[1] == 0x00) - || (recvAPDULen == 6 && recvAPDU[4] == 0x90 && recvAPDU[5] == 0x00))) - { if (debug) { - size_t i; - printf ("apdu %zd: ", recvAPDULen); - for (i = 0; i < recvAPDULen; i++) - printf ("%02x ", recvAPDU[i]); - printf ("\n"); + printf ("versionMajor %d\n", dev->versionMajor); + printf ("versionMinor %d\n", dev->versionMinor); + printf ("versionBuild %d\n", dev->versionBuild); + printf ("pgmSeq %d\n", dev->pgmSeq); + printf ("touchLevel %d\n", dev->touchLevel); + printf ("mode %02x\n", dev->mode); + printf ("crTimeout %d\n", dev->crTimeout); + printf ("autoEjectTime %d\n", dev->autoEjectTime); } - return YKNEOMGR_BACKEND_ERROR; - } + memcpy (buf, "\x00\x01\x10\x00", 4); - if (recvAPDULen == 6) - dev->serialno = GETU32 (recvAPDU); + rc = backend_apdu (dev, buf, 4, recvAPDU, &recvAPDULen); + if (rc != YKNEOMGR_OK) + return rc; + + if (!((recvAPDULen == 2 && recvAPDU[0] == 0x90 && recvAPDU[1] == 0x00) + || (recvAPDULen == 6 && recvAPDU[4] == 0x90 + && recvAPDU[5] == 0x00))) + { + if (debug) + { + size_t i; + printf ("apdu %zd: ", recvAPDULen); + for (i = 0; i < recvAPDULen; i++) + printf ("%02x ", recvAPDU[i]); + printf ("\n"); + } - if (debug) - { - printf ("serialno %d\n", dev->serialno); + return YKNEOMGR_BACKEND_ERROR; + } + + if (recvAPDULen == 6) + dev->serialno = GETU32 (recvAPDU); + + if (debug) + { + printf ("serialno %d\n", dev->serialno); + } } return YKNEOMGR_OK; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/lib/ykneomgr/ykneomgr-version.h new/libykneomgr-0.1.8/lib/ykneomgr/ykneomgr-version.h --- old/libykneomgr-0.1.7/lib/ykneomgr/ykneomgr-version.h 2015-04-09 13:22:16.000000000 +0200 +++ new/libykneomgr-0.1.8/lib/ykneomgr/ykneomgr-version.h 2015-10-01 15:07:58.000000000 +0200 @@ -30,7 +30,7 @@ * version number. Used together with ykneomgr_check_version() to verify * header file and run-time library consistency. */ -#define YKNEOMGR_VERSION_STRING "0.1.7" +#define YKNEOMGR_VERSION_STRING "0.1.8" /** * YKNEOMGR_VERSION_NUMBER @@ -40,7 +40,7 @@ * this symbol will have the value 0x01020300. The last two digits * are only used between public releases, and will otherwise be 00. */ -#define YKNEOMGR_VERSION_NUMBER 0x000107 +#define YKNEOMGR_VERSION_NUMBER 0x000108 /** * YKNEOMGR_VERSION_MAJOR @@ -67,7 +67,7 @@ * level of the header file version number. For example, when the * header version is 1.2.3 this symbol will be 3. */ -#define YKNEOMGR_VERSION_PATCH 7 +#define YKNEOMGR_VERSION_PATCH 8 const char *ykneomgr_check_version (const char *req_version); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/macosx.mk new/libykneomgr-0.1.8/macosx.mk --- old/libykneomgr-0.1.7/macosx.mk 2014-09-16 09:54:35.000000000 +0200 +++ new/libykneomgr-0.1.8/macosx.mk 2015-04-09 13:35:46.000000000 +0200 @@ -32,7 +32,7 @@ rm -rf tmp && mkdir tmp && cd tmp && \ mkdir -p root/licenses && \ cp ../libzip-$(LIBZIP_VERSION).tar.gz . || \ - wget "http://www.nih.at/libzip/libzip-$(LIBZIP_VERSION).tar.gz" && \ + curl -L -O "http://www.nih.at/libzip/libzip-$(LIBZIP_VERSION).tar.gz" && \ tar xfz libzip-$(LIBZIP_VERSION).tar.gz && \ cd libzip-$(LIBZIP_VERSION) && \ ./configure --prefix=$(PWD)/tmp$(ARCH)/root CFLAGS=-mmacosx-version-min=10.6 && \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/src/cmdline.c new/libykneomgr-0.1.8/src/cmdline.c --- old/libykneomgr-0.1.7/src/cmdline.c 2015-04-09 13:21:45.000000000 +0200 +++ new/libykneomgr-0.1.8/src/cmdline.c 2015-10-01 15:07:28.000000000 +0200 @@ -43,7 +43,7 @@ " -a, --applet-list List applets on device (default=off)", " -D, --applet-delete=STRING Delete given applet AID from device", " -i, --applet-install=FILE Install applets on device from CAP file", - " -M, --set-mode=STRING Set the USB operation mode of the YubiKey NEO.\n The possible MODE arguments are:\n 0 for HID device only,\n 1 for CCID device only,\n 2 for HID/CCID composite device.\n 81 for CCID-only with touch eject.\n 82 for HID/CCID with touch eject.", + " -M, --set-mode=STRING Set the USB operation mode of the YubiKey NEO.\n The possible MODE arguments are:\n 0 for HID device only,\n 1 for CCID device only,\n 81 for CCID device with touch eject,\n 2 for HID/CCID composite device,\n 3 for U2F device only,\n 4 for OTP/U2F composite device,\n 5 for U2F/CCID composite device,\n 6 for OTP/U2F/CCID composite device.", " -S, --send-apdu=STRING Send an arbitrary APDU to the device", " -r, --reader=STRING Use only a matching card reader", " -d, --debug Print debug information to standard error\n (default=off)", @@ -1051,9 +1051,12 @@ The possible MODE arguments are: 0 for HID device only, 1 for CCID device only, - 2 for HID/CCID composite device. - 81 for CCID-only with touch eject. - 82 for HID/CCID with touch eject.. */ + 81 for CCID device with touch eject, + 2 for HID/CCID composite device, + 3 for U2F device only, + 4 for OTP/U2F composite device, + 5 for U2F/CCID composite device, + 6 for OTP/U2F/CCID composite device.. */ if (update_arg ((void *) &(args_info->set_mode_arg), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/src/cmdline.ggo new/libykneomgr-0.1.8/src/cmdline.ggo --- old/libykneomgr-0.1.7/src/cmdline.ggo 2014-08-21 14:50:49.000000000 +0200 +++ new/libykneomgr-0.1.8/src/cmdline.ggo 2015-08-10 08:52:46.000000000 +0200 @@ -24,7 +24,7 @@ option "applet-list" a "List applets on device" flag off option "applet-delete" D "Delete given applet AID from device" string optional option "applet-install" i "Install applets on device from CAP file" string typestr="FILE" optional -option "set-mode" M "Set the USB operation mode of the YubiKey NEO.\nThe possible MODE arguments are:\n0 for HID device only,\n1 for CCID device only,\n2 for HID/CCID composite device.\n81 for CCID-only with touch eject.\n82 for HID/CCID with touch eject." string optional +option "set-mode" M "Set the USB operation mode of the YubiKey NEO.\nThe possible MODE arguments are:\n0 for HID device only,\n1 for CCID device only,\n81 for CCID device with touch eject,\n2 for HID/CCID composite device,\n3 for U2F device only,\n4 for OTP/U2F composite device,\n5 for U2F/CCID composite device,\n6 for OTP/U2F/CCID composite device." string optional option "send-apdu" S "Send an arbitrary APDU to the device" string optional multiple option "reader" r "Use only a matching card reader" string optional option "debug" d "Print debug information to standard error" flag off diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/src/cmdline.h new/libykneomgr-0.1.8/src/cmdline.h --- old/libykneomgr-0.1.7/src/cmdline.h 2015-04-09 13:21:45.000000000 +0200 +++ new/libykneomgr-0.1.8/src/cmdline.h 2015-10-01 15:07:28.000000000 +0200 @@ -71,24 +71,33 @@ The possible MODE arguments are: 0 for HID device only, 1 for CCID device only, - 2 for HID/CCID composite device. - 81 for CCID-only with touch eject. - 82 for HID/CCID with touch eject.. */ + 81 for CCID device with touch eject, + 2 for HID/CCID composite device, + 3 for U2F device only, + 4 for OTP/U2F composite device, + 5 for U2F/CCID composite device, + 6 for OTP/U2F/CCID composite device.. */ char *set_mode_orig;/**< @brief Set the USB operation mode of the YubiKey NEO. The possible MODE arguments are: 0 for HID device only, 1 for CCID device only, - 2 for HID/CCID composite device. - 81 for CCID-only with touch eject. - 82 for HID/CCID with touch eject. original value given at command line. */ + 81 for CCID device with touch eject, + 2 for HID/CCID composite device, + 3 for U2F device only, + 4 for OTP/U2F composite device, + 5 for U2F/CCID composite device, + 6 for OTP/U2F/CCID composite device. original value given at command line. */ const char *set_mode_help; /**< @brief Set the USB operation mode of the YubiKey NEO. The possible MODE arguments are: 0 for HID device only, 1 for CCID device only, - 2 for HID/CCID composite device. - 81 for CCID-only with touch eject. - 82 for HID/CCID with touch eject. help description. */ + 81 for CCID device with touch eject, + 2 for HID/CCID composite device, + 3 for U2F device only, + 4 for OTP/U2F composite device, + 5 for U2F/CCID composite device, + 6 for OTP/U2F/CCID composite device. help description. */ char **send_apdu_arg; /**< @brief Send an arbitrary APDU to the device. */ char **send_apdu_orig; /**< @brief Send an arbitrary APDU to the device original value given at command line. */ unsigned int send_apdu_min; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libykneomgr-0.1.7/src/ykneomgr.1 new/libykneomgr-0.1.8/src/ykneomgr.1 --- old/libykneomgr-0.1.7/src/ykneomgr.1 2015-04-09 13:22:28.000000000 +0200 +++ new/libykneomgr-0.1.8/src/ykneomgr.1 2015-10-01 15:08:01.000000000 +0200 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. -.TH YKNEOMGR "1" "April 2015" "ykneomgr 0.1.7" "User Commands" +.TH YKNEOMGR "1" "October 2015" "ykneomgr 0.1.8" "User Commands" .SH NAME ykneomgr \- YubiKey NEO management tool .SH SYNOPSIS .B ykneomgr [\fIOPTIONS\fR]... .SH DESCRIPTION -ykneomgr 0.1.7 +ykneomgr 0.1.8 .PP YubiKey NEO management tool. .TP @@ -43,9 +43,12 @@ The possible MODE arguments are: 0 for HID device only, 1 for CCID device only, -2 for HID/CCID composite device. -81 for CCID\-only with touch eject. -82 for HID/CCID with touch eject. +81 for CCID device with touch eject, +2 for HID/CCID composite device, +3 for U2F device only, +4 for OTP/U2F composite device, +5 for U2F/CCID composite device, +6 for OTP/U2F/CCID composite device. .TP \fB\-S\fR, \fB\-\-send\-apdu\fR=\fISTRING\fR Send an arbitrary APDU to the device
