...
 
Commits (10)
......@@ -28,8 +28,8 @@ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1e0d", ATTRS{idProduct
# HyperSecu HyperFIDO
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e|2ccf", ATTRS{idProduct}=="0880", GROUP="plugdev", MODE="0660"
# Feitian ePass FIDO
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0852|0853|0854|0856|0858|085a|085b", GROUP="plugdev", MODE="0660"
# Feitian ePass FIDO, BioPass FIDO2
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0852|0853|0854|0856|0858|085a|085b|085d", GROUP="plugdev", MODE="0660"
# JaCarta U2F
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="24dc", ATTRS{idProduct}=="0101", GROUP="plugdev", MODE="0660"
......@@ -52,4 +52,7 @@ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="20a0", ATTRS{idProduct
# Google Titan U2F
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="5026", GROUP="plugdev", MODE="0660"
# Tomu board + chopstx U2F
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="cdab", GROUP="plugdev", MODE="0660"
LABEL="u2f_end"
......@@ -28,8 +28,8 @@ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1e0d", ATTRS{idProduct
# HyperSecu HyperFIDO
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e|2ccf", ATTRS{idProduct}=="0880", TAG+="uaccess"
# Feitian ePass FIDO
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0852|0853|0854|0856|0858|085a|085b", TAG+="uaccess"
# Feitian ePass FIDO, BioPass FIDO2
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0852|0853|0854|0856|0858|085a|085b|085d", TAG+="uaccess"
# JaCarta U2F
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="24dc", ATTRS{idProduct}=="0101", TAG+="uaccess"
......@@ -52,4 +52,7 @@ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="20a0", ATTRS{idProduct
# Google Titan U2F
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="5026", TAG+="uaccess"
# Tomu board + chopstx U2F
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="cdab", TAG+="uaccess"
LABEL="u2f_end"
2018-12-27 Klas Lindfors <klas@yubico.com>
* NEWS: NEWS for 1.1.7
2019-01-08 Klas Lindfors <klas@yubico.com>
* u2f-host/u2fmisc.c: lib: when receiving data, make sure to not
copy one packet to much this might lead to a 64 byte buffer-overflow
2018-12-27 Klas Lindfors <klas@yubico.com>
* u2f-host/devs.c: lib: make sure that we don't copy in a to large
initresp from device reported by Christian Reitter
2018-12-27 Klas Lindfors <klas@yubico.com>
* README: doc: fix whitespace at end of line
2018-12-27 Klas Lindfors <klas@yubico.com>
* macosx.mk, windows.mk: build: newer libjson for win and mac
2018-12-11 Klas Lindfors <klas@yubico.com>
* : commit 15c6ca2c5f747cf7f24a2d6af4a9a5ce8d1da01a Author: Francois
Gervais <francoisgervais@gmail.com> Date: Wed Dec 5 16:54:16 2018
-0500
2018-11-20 Klas Lindfors <klas@yubico.com>
* : commit 986e5f62dacc3ec94560ccf46fe0054e7e76af57 Merge: 0a2a3ce
885c876 Author: Klas Lindfors <klas@yubico.com> Date: Fri Sep 28
13:53:37 2018 +0200
2018-09-27 André Brandenburger <brandenburger@dismail.de>
* README: References to server-side library inside README file
2018-08-10 Alessio Di Mauro <alessio@yubico.com>
* : commit 6f9279fa6f0e9a1e0ec9b44a60d121d6731f9a37 Author: Alessio
Di Mauro <alessio@yubico.com> Date: Wed Aug 8 14:56:19 2018 +0200
2018-08-07 Louis-Philippe Véronneau <pollito@riseup.net>
* 70-old-u2f.rules, 70-u2f.rules, u2f.conf.sample: add support for
tomu board with chopstx u2f
2018-05-15 Klas Lindfors <klas@yubico.com>
* NEWS, configure.ac: bump versions.
2018-05-15 Klas Lindfors <klas@yubico.com>
* NEWS: NEWS for 1.1.6
......
......@@ -51,11 +51,3 @@ my-release:
gpg --verify $(PACKAGE)-$(VERSION).tar.xz.sig
gpg --verify $(PACKAGE)-$(VERSION)-win32.zip.sig
gpg --verify $(PACKAGE)-$(VERSION)-win64.zip.sig
cd $(srcdir) && git push
cd $(srcdir) && git tag -s -m "$(PACKAGE) $(VERSION)" $(PACKAGE)-$(VERSION)
cd $(srcdir) && git push --tags
$(YUBICO_WWW_REPO)/publish $(PACKAGE) $(VERSION) $(PACKAGE)-$(VERSION).tar.xz*
$(YUBICO_WWW_REPO)/publish $(PACKAGE) $(VERSION) $(PACKAGE)-$(VERSION)-win32.zip*
$(YUBICO_WWW_REPO)/publish $(PACKAGE) $(VERSION) $(PACKAGE)-$(VERSION)-win64.zip*
$(HELP2ADOC) -e src/u2f-host -n "Yubico Universal 2nd Factor (U2F) Host Tool" > u2f-host.1.txt
$(YUBICO_WWW_REPO)/save-mans $(PACKAGE) u2f-host.1.txt
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -351,6 +351,9 @@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
......@@ -808,7 +811,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -833,7 +836,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -851,7 +854,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -861,7 +864,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......@@ -1085,14 +1088,6 @@ my-release:
gpg --verify $(PACKAGE)-$(VERSION).tar.xz.sig
gpg --verify $(PACKAGE)-$(VERSION)-win32.zip.sig
gpg --verify $(PACKAGE)-$(VERSION)-win64.zip.sig
cd $(srcdir) && git push
cd $(srcdir) && git tag -s -m "$(PACKAGE) $(VERSION)" $(PACKAGE)-$(VERSION)
cd $(srcdir) && git push --tags
$(YUBICO_WWW_REPO)/publish $(PACKAGE) $(VERSION) $(PACKAGE)-$(VERSION).tar.xz*
$(YUBICO_WWW_REPO)/publish $(PACKAGE) $(VERSION) $(PACKAGE)-$(VERSION)-win32.zip*
$(YUBICO_WWW_REPO)/publish $(PACKAGE) $(VERSION) $(PACKAGE)-$(VERSION)-win64.zip*
$(HELP2ADOC) -e src/u2f-host -n "Yubico Universal 2nd Factor (U2F) Host Tool" > u2f-host.1.txt
$(YUBICO_WWW_REPO)/save-mans $(PACKAGE) u2f-host.1.txt
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
libu2f-host NEWS -- History of user visible changes.
* Version 1.1.7 (released 2019-01-08)
** Fix for trusting length from deivce in device init.
Reported by Christian Reitter.
** Fix for buffer overflow when receiving data from device.
** Add udev rules for some new devices.
* Version 1.1.6 (released 2018-05-15)
** Change waiting logic on authenticate to allow for faster feedback.
......
......@@ -7,6 +7,8 @@ Introduction
Libu2f-host provides a C library and command-line tool that implements
the host-side of the U2F protocol. There are APIs to talk to a U2F
device and perform the U2F Register and U2F Authenticate operations.
For the server-side aspect, see our
https://developers.yubico.com/libu2f-server/[libu2f-server project].
License
-------
......@@ -33,7 +35,7 @@ testing. We describe how you could use it here.
First get a _register_ challenge JSON blob somehow. You could use the
https://demo.yubico.com/u2f[Yubico U2F demo server] interactively in a browser (with the U2F
extension disabled). Alternatively,
use the WSAPI. For example:
use the WSAPI or https://github.com/Yubico/libu2f-server[our server-side library]. For example:
$ curl 'https://demo.yubico.com/wsapi/u2f/enroll?username=jas&password=foo' > foo
......
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -296,7 +296,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -311,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -327,12 +327,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# Copyright (C) 2011-2014 Free Software Foundation, Inc.
# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -394,7 +394,7 @@ AC_SUBST([AR])dnl
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -446,7 +446,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -477,7 +477,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -668,7 +668,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -744,7 +744,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -941,7 +941,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -962,7 +962,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -983,7 +983,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1033,7 +1033,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1072,7 +1072,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1101,7 +1101,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1148,7 +1148,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1167,7 +1167,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1248,7 +1248,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1308,7 +1308,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1336,7 +1336,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1355,7 +1355,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
This diff is collapsed.
......@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_INIT([libu2f-host], [1.1.6], [yubico-devel@googlegroups.com])
AC_INIT([libu2f-host], [1.1.7], [yubico-devel@googlegroups.com])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
......@@ -21,7 +21,7 @@ AC_CONFIG_AUX_DIR([build-aux])
# http://www.gnu.org/s/libtool/manual/html_node/Updating-version-info.html
AC_SUBST(LT_CURRENT, 1) # Interfaces removed: CURRENT++, AGE=0, REVISION=0
AC_SUBST(LT_AGE, 1) # Interfaces added: CURRENT++, AGE++, REVISION=0
AC_SUBST(LT_REVISION, 6) # No interfaces changed: REVISION++
AC_SUBST(LT_REVISION, 7) # No interfaces changed: REVISION++
AM_INIT_AUTOMAKE([gnits dist-xz no-dist-gzip std-options -Wall])
AM_SILENT_RULES([yes])
......
libu2f-host (1.1.7-1) unstable; urgency=critical
* New upstream version 1.1.7
+ Fix CVE-2018-20340 (Closes: #921725)
+ Add support for new device: tomu board with chopstx u2f
+ Drop obsolete patch
* debian/libu2f-udev.metainfo.py
+ Typecheck with mypy, fix exposed issues
+ Display line number in error messages
* debian/control: Update my uploader email address
* Add Build-Depends-Package metadata to the symbols file
* Use a script to generate an up-to-date, minimal, upstream keyring
* Comply with policy v4.3.0
- Ship upstream NEWS file
* debian/libu2f-udev.metainfo.*
+ Fix minor wart in AppStream metadata generation script
+ Relicense under LGPL-2.1+
The metadata generated by the Python script is derived from udev rules
that are themselves under LGPL-2.1+
While it's arguably a collection of facts (and non-copyrightable),
it makes things easier if we claim the same license for the generating
scripts, input data, and generated artifacts.
-- Nicolas Braud-Santoni <nicoo@debian.org> Fri, 08 Feb 2019 20:09:53 +0100
libu2f-host (1.1.6-1) unstable; urgency=medium
* New upstream version 1.1.6 (2018-05-15)
......
......@@ -4,7 +4,7 @@ Uploaders:
Simon Josefsson <simon@josefsson.org>,
Klas Lindfors <klas@yubico.com>,
Dain Nilsson <dain@yubico.com>,
Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Nicolas Braud-Santoni <nicoo@debian.org>
Section: utils
Priority: optional
Build-Depends: dblatex,
......@@ -18,7 +18,7 @@ Build-Depends: dblatex,
pkg-config,
python3,
udev [linux-any]
Standards-Version: 4.1.5
Standards-Version: 4.3.0
Rules-Requires-Root: no
Homepage: https://developers.yubico.com/libu2f-host/
Vcs-Browser: https://salsa.debian.org/auth-team/libu2f-host
......
......@@ -15,6 +15,12 @@ Copyright: Copyright (c) 2013-2015 Yubico AB
Copyright (c) 2016-2018 Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
License: GPL-3+
Files: debian/libu2f-udev.metainfo.*
Copyright: Copyright (c) 2018-2019 Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
License: LGPL-2.1+
Comment:
Those files generate AppStream metadata, based (in part) on the udev
rules shipped by the package, which are themselves under LGPL-2.1+.
License: GPL-3+
This program is free software; you can redistribute it and/or modify
......
libu2f-host.so.0 libu2f-host0 #MINVER#
* Build-Depends-Package: libu2f-host-dev
U2F_HOST_0.0@U2F_HOST_0.0 0.0
U2F_HOST_1.1@U2F_HOST_1.1 1.1.0
u2fh_authenticate2@U2F_HOST_1.1 1.1.0
......
......@@ -29,8 +29,8 @@ class Rule(NamedTuple):
def parse_rule(f) -> Iterable[Rule]:
"""Parse a udev rule file."""
syntax = re.compile(r'KERNEL=="hidraw\*", SUBSYSTEM=="hidraw", '
'ATTRS\{idVendor\}=="(?P<vendors>[^"]*)", '
'ATTRS\{idProduct\}=="(?P<products>[^"]*)"')
r'ATTRS\{idVendor\}=="(?P<vendors>[^"]*)", '
r'ATTRS\{idProduct\}=="(?P<products>[^"]*)"')
for line_no, line in enumerate(f.readlines(), start=1):
line = line.strip()
......
<?xml version="1.0" encoding="UTF-8"?>
<component>
<id>libu2f-udev</id>
<metadata_license>ISC</metadata_license>
<metadata_license>LGPL-2.1+</metadata_license>
<name>libu2f-udev</name>
<summary>Provide user access to U2F devices</summary>
<description>
......
Subject: gtk-doc: gtkdoc-mktmpl is dead
---
gtk-doc/Makefile.am | 4 ----
gtk-doc/Makefile.in | 29 +++--------------------------
gtk-doc/gtk-doc.make | 25 +++----------------------
3 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/gtk-doc/Makefile.am b/gtk-doc/Makefile.am
index 905fa63..667d179 100644
Origin: vendor
Bug: 876579
Forwarded: No
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Reviewed-by: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Last-Update: 2017-10-30
Applied-Upstream: No
--- a/gtk-doc/Makefile.am
+++ b/gtk-doc/Makefile.am
@@ -35,10 +35,6 @@ SCAN_OPTIONS=
# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
MKDB_OPTIONS=--xml-mode --output-format=xml
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
# Extra options to supply to gtkdoc-mkhtml
MKHTML_OPTIONS=
diff --git a/gtk-doc/Makefile.in b/gtk-doc/Makefile.in
index 8a8b2f5..93b398f 100644
--- a/gtk-doc/Makefile.in
+++ b/gtk-doc/Makefile.in
@@ -447,10 +447,6 @@ SCAN_OPTIONS =
# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
MKDB_OPTIONS = --xml-mode --output-format=xml
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS =
-
# Extra options to supply to gtkdoc-mkhtml
MKHTML_OPTIONS =
@@ -518,9 +514,8 @@ SETUP_FILES = \
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES)
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
- html-build.stamp pdf-build.stamp \
- tmpl.stamp sgml.stamp html.stamp pdf.stamp
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@@ -806,27 +801,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
-#### templates ####
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo ' DOC Rebuilding template files'
- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- if test -w $(abs_srcdir) ; then \
- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
- fi \
- fi
- @touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
- @true
-
-$(srcdir)/tmpl/*.sgml:
- @true
-
#### xml ####
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo ' DOC Building XML'
@-chmod -R u+w $(srcdir)
@_source_dir='' ; \
diff --git a/gtk-doc/gtk-doc.make b/gtk-doc/gtk-doc.make
index 1f75dfd..33260b6 100644
--- a/gtk-doc/gtk-doc.make
+++ b/gtk-doc/gtk-doc.make
@@ -33,9 +33,8 @@ EXTRA_DIST = \
$(HTML_IMAGES) \
$(SETUP_FILES)
-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
- html-build.stamp pdf-build.stamp \
- tmpl.stamp sgml.stamp html.stamp pdf.stamp
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@@ -120,27 +119,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
-#### templates ####
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo ' DOC Rebuilding template files'
- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- if test -w $(abs_srcdir) ; then \
- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
- fi \
- fi
- @touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
- @true
-
-$(srcdir)/tmpl/*.sgml:
- @true
-
#### xml ####
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo ' DOC Building XML'
@-chmod -R u+w $(srcdir)
@_source_dir='' ; \
0001-gtk-doc-gtkdoc-mktmpl-is-dead.patch
......@@ -24,6 +24,9 @@ override_dh_auto_build:
# Build the AppStream metadata from the udev rule file
debian/libu2f-udev.metainfo.py > libu2f-udev.metainfo.xml
override_dh_installchangelogs:
dh_installchangelogs NEWS
override_dh_compress:
dh_compress -Xu2f-host.pdf
......
This source diff could not be displayed because it is too large. You can view the blob instead.
#!/usr/bin/env bash
set -euo pipefail
KEYS=(
0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A # Klas Lindfors <klas@yubico.com>
20EE325B86A81BCBD3E56798F04367096FBA95E8 # Dain Nilsson <dain@yubico.com>
B70D62AA6A31AD6B9E4F9F4BDC8888925D25CA7A # Alessio Di Mauro <alessio@yubico.com>
FF8AF719AE5828181B894D831CE39268A0973948 # Tommaso De Orchi <tom@yubico.com>
B6042E2BD1FDBC2BCA8588B2FF8D3B45B7B875A9 # Jean Paul Galea <jeanpaul@yubico.com>
8D0B4EBA9345254BCEC0E843514F078FF4AB24C3 # Dag Heyman <dag@yubico.com>
57A9DEED4C6D962A923BB691816F3ED99921835E # Emil Lundberg <emil@yubico.com>
268583B64786F50F807456DA8CED3A80D41C0DCB # Trevor Bentley <trevor@yubico.com>
EE90AE0D19774C8386628FAAB428949EF7914718 # Pedro Martelletto <pedro@yubico.com>
)
if [ $# -gt 0 ]; then
exec gpg "$@" "${KEYS[@]}"
else
exec gpg --export --export-options export-minimal -a --yes \
-o "$(dirname "$0")/signing-key.asc" "${KEYS[@]}"
fi
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -338,6 +338,9 @@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
......
This diff is collapsed.
This diff is collapsed.
gtk-doc/html/home.png

169 Bytes | W: | H:

gtk-doc/html/home.png

169 Bytes | W: | H:

gtk-doc/html/home.png
gtk-doc/html/home.png
gtk-doc/html/home.png
gtk-doc/html/home.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="Yubico Universal 2nd Factor C Library">
<link rel="next" href="intro.html" title="Yubico Universal 2nd Factor C Library">
<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -38,6 +38,6 @@
</dl></div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.25</div>
<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
......@@ -8,7 +8,7 @@
<link rel="up" href="index.html" title="Yubico Universal 2nd Factor C Library">
<link rel="prev" href="index.html" title="Yubico Universal 2nd Factor C Library">
<link rel="next" href="u2f-host-u2f-host.html" title="u2f-host">
<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -41,6 +41,6 @@
</p>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.25</div>
<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
gtk-doc/html/left-insensitive.png

333 Bytes | W: | H:

gtk-doc/html/left-insensitive.png

334 Bytes | W: | H:

gtk-doc/html/left-insensitive.png
gtk-doc/html/left-insensitive.png
gtk-doc/html/left-insensitive.png
gtk-doc/html/left-insensitive.png
  • 2-up
  • Swipe
  • Onion skin
gtk-doc/html/left.png

193 Bytes | W: | H:

gtk-doc/html/left.png

185 Bytes | W: | H:

gtk-doc/html/left.png
gtk-doc/html/left.png
gtk-doc/html/left.png
gtk-doc/html/left.png
  • 2-up
  • Swipe
  • Onion skin
gtk-doc/html/right-insensitive.png

233 Bytes | W: | H:

gtk-doc/html/right-insensitive.png

233 Bytes | W: | H:

gtk-doc/html/right-insensitive.png
gtk-doc/html/right-insensitive.png
gtk-doc/html/right-insensitive.png
gtk-doc/html/right-insensitive.png
  • 2-up
  • Swipe
  • Onion skin
gtk-doc/html/right.png

185 Bytes | W: | H:

gtk-doc/html/right.png

184 Bytes | W: | H:

gtk-doc/html/right.png
gtk-doc/html/right.png
gtk-doc/html/right.png
gtk-doc/html/right.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -8,7 +8,7 @@
<link rel="up" href="intro.html" title="Yubico Universal 2nd Factor C Library">
<link rel="prev" href="u2f-host-u2f-host.html" title="u2f-host">
<link rel="next" href="u2f-host-u2f-host-version.html" title="u2f-host-version">
<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -60,8 +60,6 @@
</div>
<div class="refsect1">
<a name="u2f-host-u2f-host-types.description"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1">
<a name="u2f-host-u2f-host-types.functions_details"></a><h2>Functions</h2>
......@@ -139,8 +137,8 @@
</tr>
<tr>
<td class="enum_member_name"><p><a name="U2FH-SIZE-ERROR:CAPS"></a>U2FH_SIZE_ERROR</p></td>
<td class="enum_member_description"> </td>
<td class="enum_member_annotations"> </td>
<td> </td>
<td> </td>
</tr>
</tbody>
</table></div>
......@@ -195,12 +193,10 @@
<a name="u2fh-devs"></a><h3>u2fh_devs</h3>
<pre class="programlisting">typedef struct u2fh_devs u2fh_devs;
</pre>
<p>
</p>
</div>
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.25</div>
<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
......@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="Yubico Universal 2nd Factor C Library">
<link rel="up" href="intro.html" title="Yubico Universal 2nd Factor C Library">
<link rel="prev" href="u2f-host-u2f-host-types.html" title="u2f-host-types">
<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -79,8 +79,6 @@
</div>
<div class="refsect1">
<a name="u2f-host-u2f-host-version.description"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1">
<a name="u2f-host-u2f-host-version.functions_details"></a><h2>Functions</h2>
......@@ -120,7 +118,7 @@ run-time library does not meet the required version number.</p>
<a name="u2f-host-u2f-host-version.other_details"></a><h2>Types and Values</h2>
<div class="refsect2">
<a name="U2FH-VERSION-STRING:CAPS"></a><h3>U2FH_VERSION_STRING</h3>
<pre class="programlisting">#define U2FH_VERSION_STRING "1.1.5"
<pre class="programlisting">#define U2FH_VERSION_STRING "1.1.7"
</pre>
<p>Pre-processor symbol with a string that describe the header file
version number. Used together with <a class="link" href="u2f-host-u2f-host-version.html#u2fh-check-version" title="u2fh_check_version ()"><code class="function">u2fh_check_version()</code></a> to verify
......@@ -129,7 +127,7 @@ header file and run-time library consistency.</p>
<hr>
<div class="refsect2">
<a name="U2FH-VERSION-NUMBER:CAPS"></a><h3>U2FH_VERSION_NUMBER</h3>
<pre class="programlisting">#define U2FH_VERSION_NUMBER 0x010105
<pre class="programlisting">#define U2FH_VERSION_NUMBER 0x010107
</pre>
<p>Pre-processor symbol with a hexadecimal value describing the header
file version number. For example, when the header version is 1.2.3
......@@ -157,7 +155,7 @@ header version is 1.2.3 this symbol will be 2.</p>
<hr>
<div class="refsect2">
<a name="U2FH-VERSION-PATCH:CAPS"></a><h3>U2FH_VERSION_PATCH</h3>
<pre class="programlisting">#define U2FH_VERSION_PATCH 5
<pre class="programlisting">#define U2FH_VERSION_PATCH 7
</pre>
<p>Pre-processor symbol with a decimal value that describe the patch
level of the header file version number. For example, when the
......@@ -166,6 +164,6 @@ header version is 1.2.3 this symbol will be 3.</p>
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.25</div>
<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
......@@ -8,7 +8,7 @@
<link rel="up" href="intro.html" title="Yubico Universal 2nd Factor C Library">
<link rel="prev" href="intro.html" title="Yubico Universal 2nd Factor C Library">
<link rel="next" href="u2f-host-u2f-host-types.html" title="u2f-host-types">
<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -33,8 +33,6 @@
</tr></table></div>
<div class="refsect1">
<a name="u2f-host-u2f-host.description"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1">
<a name="u2f-host-u2f-host.functions_details"></a><h2>Functions</h2>
......@@ -45,6 +43,6 @@
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.25</div>
<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
gtk-doc/html/up-insensitive.png

288 Bytes | W: | H:

gtk-doc/html/up-insensitive.png

288 Bytes | W: | H:

gtk-doc/html/up-insensitive.png
gtk-doc/html/up-insensitive.png
gtk-doc/html/up-insensitive.png
gtk-doc/html/up-insensitive.png
  • 2-up
  • Swipe
  • Onion skin
gtk-doc/html/up.png

187 Bytes | W: | H:

gtk-doc/html/up.png

186 Bytes | W: | H:

gtk-doc/html/up.png
gtk-doc/html/up.png
gtk-doc/html/up.png
gtk-doc/html/up.png
  • 2-up
  • Swipe
  • Onion skin
<!-- ##### SECTION Title ##### -->
u2f-host-types
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### ENUM u2fh_rc ##### -->
<para>
</para>
@U2FH_OK:
@U2FH_MEMORY_ERROR:
@U2FH_TRANSPORT_ERROR:
@U2FH_JSON_ERROR:
@U2FH_BASE64_ERROR:
@U2FH_NO_U2F_DEVICE:
@U2FH_AUTHENTICATOR_ERROR:
@U2FH_TIMEOUT_ERROR:
@U2FH_SIZE_ERROR:
<!-- ##### ENUM u2fh_initflags ##### -->
<para>
</para>
@U2FH_DEBUG:
<!-- ##### ENUM u2fh_cmdflags ##### -->
<para>
</para>
@U2FH_REQUEST_USER_PRESENCE:
<!-- ##### TYPEDEF u2fh_devs ##### -->
<para>
</para>
<!-- ##### FUNCTION u2fh_authenticate ##### -->
<para>
</para>
@devs:
@challenge:
@origin:
@response:
@flags:
@Returns:
<!-- ##### FUNCTION u2fh_devs_discover ##### -->
<para>
</para>
@devs:
@max_index:
@Returns:
<!-- ##### FUNCTION u2fh_devs_done ##### -->
<para>
</para>
@devs:
<!-- ##### FUNCTION u2fh_devs_init ##### -->
<para>
</para>
@devs:
@Returns:
<!-- ##### FUNCTION u2fh_get_device_description ##### -->
<para>
</para>
@devs:
@index:
@out:
@len:
@Returns:
<!-- ##### FUNCTION u2fh_global_done ##### -->
<para>
</para>
@void:
<!-- ##### FUNCTION u2fh_global_init ##### -->
<para>
</para>
@flags:
@Returns:
<!-- ##### FUNCTION u2fh_is_alive ##### -->
<para>
</para>
@devs:
@index:
@Returns:
<!-- ##### FUNCTION u2fh_register ##### -->
<para>
</para>
@devs:
@challenge:
@origin:
@response:
@flags:
@Returns:
<!-- ##### FUNCTION u2fh_sendrecv ##### -->
<para>
</para>
@devs:
@index:
@cmd:
@send:
@sendlen:
@recv:
@recvlen:
@Returns:
<!-- ##### FUNCTION u2fh_strerror ##### -->
<para>
</para>
@err:
@Returns:
<!-- ##### FUNCTION u2fh_strerror_name ##### -->
<para>
</para>
@err:
@Returns:
<!-- ##### SECTION Title ##### -->
u2f-host-version
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### MACRO U2FH_VERSION_STRING ##### -->
<para>
</para>
<!-- ##### MACRO U2FH_VERSION_NUMBER ##### -->
<para>
</para>
<!-- ##### MACRO U2FH_VERSION_MAJOR ##### -->
<para>
</para>
<!-- ##### MACRO U2FH_VERSION_MINOR ##### -->
<para>
</para>
<!-- ##### MACRO U2FH_VERSION_PATCH ##### -->
<para>
</para>
<!-- ##### FUNCTION u2fh_check_version ##### -->
<para>
</para>
@req_version:
@Returns:
<!-- ##### SECTION Title ##### -->
u2f-host
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
dnl -*- mode: autoconf -*-
# -*- mode: autoconf -*-
#
# gtk-doc.m4 - configure macro to check for gtk-doc
# Copyright (C) 2003 James Henstridge
# 2007-2017 Stefan Sauer
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception, the above copyright owner gives unlimited
# permission to copy, distribute and modify the configure scripts that
# are the output of Autoconf when processing the Macro. You need not
# follow the terms of the GNU General Public License when using or
# distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
# serial 1
# serial 2
dnl Usage:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
......@@ -10,8 +35,24 @@ AC_DEFUN([GTK_DOC_CHECK],
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
AC_MSG_CHECKING([for gtk-doc])
PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
AC_MSG_RESULT($have_gtk_doc)
if test "$have_gtk_doc" = "no"; then
AC_MSG_WARN([
You will not be able to create source packages with 'make dist'
because $gtk_doc_requires is not found.])
fi
dnl check for tools we added during development
AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
dnl may not be writable by the user. Currently, automake requires that the
dnl test name must end in '.test'.
dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
......@@ -28,17 +69,22 @@ AC_DEFUN([GTK_DOC_CHECK],
[use gtk-doc to build documentation [[default=no]]]),,
[enable_gtk_doc=no])
if test x$enable_gtk_doc = xyes; then
ifelse([$1],[],
[PKG_CHECK_EXISTS([gtk-doc],,
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
fi
AC_MSG_CHECKING([whether to build gtk-doc documentation])
AC_MSG_RESULT($enable_gtk_doc)
if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
AC_MSG_ERROR([
You must have $gtk_doc_requires installed to build documentation for
$PACKAGE_NAME. Please install gtk-doc or disable building the
documentation by adding '--disable-gtk-doc' to '[$]0'.])
fi
dnl don't check for glib if we build glib
if test "x$PACKAGE_NAME" != "xglib"; then
dnl don't fail if someone does not have glib
PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
fi
dnl enable/disable output formats
AC_ARG_ENABLE([gtk-doc-html],
AS_HELP_STRING([--enable-gtk-doc-html],
......@@ -53,7 +99,12 @@ AC_DEFUN([GTK_DOC_CHECK],
enable_gtk_doc_pdf=no
fi
if test -z "$AM_DEFAULT_VERBOSITY"; then
AM_DEFAULT_VERBOSITY=1
fi
AC_SUBST([AM_DEFAULT_VERBOSITY])
AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
......
......@@ -13,7 +13,7 @@
# 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/>.
LIBJSONVERSION=0.11
LIBJSONVERSION=0.12.1
HIDAPIHASH=a6a622ffb680c55da0de787ff93b80280498330f
PACKAGE=libu2f-host
......@@ -54,8 +54,6 @@ doit:
PKG_CONFIG_PATH=$(PWD)/tmp$(ARCH)/root/lib/pkgconfig ./configure --prefix=$(PWD)/tmp$(ARCH)/root CFLAGS=-mmacosx-version-min=10.6 && \
make install check && \
install_name_tool -id @executable_path/../lib/libjson-c.2.dylib $(PWD)/tmp/root/lib/libjson-c.2.dylib && \
install_name_tool -id @executable_path/../lib/libjson.0.dylib $(PWD)/tmp/root/lib/libjson.0.dylib && \
install_name_tool -change $(PWD)/tmp/root/lib/libjson-c.2.dylib @executable_path/../lib/libjson-c.2.dylib $(PWD)/tmp/root/lib/libjson.dylib && \
install_name_tool -id @executable_path/../lib/libhidapi.0.dylib $(PWD)/tmp/root/lib/libhidapi.0.dylib && \
install_name_tool -id @executable_path/../lib/libu2f-host.0.dylib $(PWD)/tmp/root/lib/libu2f-host.0.dylib && \
install_name_tool -change $(PWD)/tmp/root/lib/libjson-c.2.dylib @executable_path/../lib/libjson-c.2.dylib $(PWD)/tmp/root/lib/libu2f-host.0.dylib && \
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -320,6 +320,9 @@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
......
This diff is collapsed.
This diff is collapsed.
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH U2F-HOST "1" "April 2018" "u2f-host 1.1.6" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH U2F-HOST "1" "January 2019" "u2f-host 1.1.7" "User Commands"
.SH NAME
u2f-host \- Yubico Universal 2nd Factor (U2F) Host Tool
.SH SYNOPSIS
.B u2f-host
[\fI\,OPTIONS\/\fR]...
.SH DESCRIPTION
u2f\-host 1.1.6
u2f\-host 1.1.7
.PP
Perform U2F host\-side operations on the command line. Reads challenge from
standard input and writes a response to standard output.
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -485,6 +485,9 @@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -331,6 +331,9 @@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
......
......@@ -247,6 +247,10 @@ init_device (u2fh_devs * devs, struct u2fdevice *dev)
&resplen) == U2FH_OK)
{
U2FHID_INIT_RESP initresp;
if (resplen > sizeof (initresp))
{
return U2FH_MEMORY_ERROR;
}
memcpy (&initresp, resp, resplen);
dev->cid = initresp.cid;
dev->versionInterface = initresp.versionInterface;
......
......@@ -30,7 +30,7 @@ extern "C"
* version number. Used together with u2fh_check_version() to verify
* header file and run-time library consistency.
*/
#define U2FH_VERSION_STRING "1.1.6"
#define U2FH_VERSION_STRING "1.1.7"
/**
* U2FH_VERSION_NUMBER
......@@ -40,7 +40,7 @@ extern "C"
* this symbol will have the value 0x01020300. The last two digits
* are only used between public releases, and will otherwise be 00.
*/
#define U2FH_VERSION_NUMBER 0x010106
#define U2FH_VERSION_NUMBER 0x010107
/**
* U2FH_VERSION_MAJOR
......@@ -67,7 +67,7 @@ extern "C"
* level of the header file version number. For example, when the
* header version is 1.2.3 this symbol will be 3.
*/
#define U2FH_VERSION_PATCH 6
#define U2FH_VERSION_PATCH 7
const char *u2fh_check_version (const char *req_version);
......
......@@ -312,6 +312,10 @@ u2fh_sendrecv (u2fh_devs * devs, unsigned index, uint8_t cmd,
frame.cont.seq, sequence);
return U2FH_TRANSPORT_ERROR;
}
if (recvddata + sizeof (frame.cont.data) > maxlen)
{
return U2FH_TRANSPORT_ERROR;
}
memcpy (recv + recvddata, frame.cont.data, sizeof (frame.cont.data));
recvddata += sizeof (frame.cont.data);
}
......
......@@ -13,7 +13,7 @@
# 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/>.
LIBJSONVERSION=0.11
LIBJSONVERSION=0.13.1
HIDAPIHASH=0cbc3a409bcb45cefb3edbf144d64ddd4e0821ce
PACKAGE=libu2f-host
......