Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/libfido2 merge conflicts and update between lib...



details:   https://anonhg.NetBSD.org/src/rev/8cdf5131c4fb
branches:  trunk
changeset: 379744:8cdf5131c4fb
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jun 17 01:15:44 2021 +0000

description:
merge conflicts and update between libfido 1.5.0 and 1.7.0

diffstat:

 external/bsd/libfido2/Makefile.inc                       |    5 +-
 external/bsd/libfido2/bin/fido2-assert/Makefile          |    5 +-
 external/bsd/libfido2/bin/fido2-cred/Makefile            |    5 +-
 external/bsd/libfido2/bin/fido2-token/Makefile           |    5 +-
 external/bsd/libfido2/dist/.github/workflows/scan.yml    |   36 -
 external/bsd/libfido2/dist/.github/workflows/windows.yml |   14 -
 external/bsd/libfido2/dist/.travis.yml                   |   86 ----
 external/bsd/libfido2/dist/.travis/build-linux-clang     |   22 -
 external/bsd/libfido2/dist/.travis/build-linux-gcc       |   19 -
 external/bsd/libfido2/dist/.travis/build-linux-mingw     |   47 --
 external/bsd/libfido2/dist/.travis/build-osx-clang       |   24 -
 external/bsd/libfido2/dist/.travis/fuzz-linux-asan       |   58 ---
 external/bsd/libfido2/dist/.travis/fuzz-linux-msan       |   58 ---
 external/bsd/libfido2/dist/debian/changelog              |   80 ----
 external/bsd/libfido2/dist/debian/compat                 |    1 -
 external/bsd/libfido2/dist/debian/control                |   53 --
 external/bsd/libfido2/dist/debian/copyright              |   85 ----
 external/bsd/libfido2/dist/debian/fido2-tools.install    |    1 -
 external/bsd/libfido2/dist/debian/fido2-tools.manpages   |    3 -
 external/bsd/libfido2/dist/debian/libfido2-1.install     |    1 -
 external/bsd/libfido2/dist/debian/libfido2-1.symbols     |  148 --------
 external/bsd/libfido2/dist/debian/libfido2-dev.install   |   29 -
 external/bsd/libfido2/dist/debian/libfido2-dev.links     |  276 ---------------
 external/bsd/libfido2/dist/debian/libfido2-dev.manpages  |   25 -
 external/bsd/libfido2/dist/debian/libfido2-udev.install  |    1 -
 external/bsd/libfido2/dist/debian/rules                  |    9 -
 external/bsd/libfido2/dist/debian/source/format          |    1 -
 external/bsd/libfido2/dist/docker/bionic/Dockerfile      |   14 -
 external/bsd/libfido2/dist/fuzz/corpus.tgz               |  Bin 
 external/bsd/libfido2/dist/openbsd-compat/diff.sh        |   24 -
 external/bsd/libfido2/dist/src/hid_netbsd.c              |  203 ++++++----
 external/bsd/libfido2/dist/tools/macos_pkg.sh            |   44 --
 external/bsd/libfido2/dist/tools/util.c                  |    1 +
 external/bsd/libfido2/dist/x                             |   71 ---
 external/bsd/libfido2/dist/xx                            |   34 -
 external/bsd/libfido2/lib/Makefile                       |   14 +-
 external/bsd/libfido2/lib/fido2.map                      |   28 +
 37 files changed, 183 insertions(+), 1347 deletions(-)

diffs (truncated from 1979 to 300 lines):

diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/Makefile.inc
--- a/external/bsd/libfido2/Makefile.inc        Thu Jun 17 00:38:06 2021 +0000
+++ b/external/bsd/libfido2/Makefile.inc        Thu Jun 17 01:15:44 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2020/12/04 18:27:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2021/06/17 01:15:44 christos Exp $
 
 DIST:=${.PARSEDIR}/dist
 
@@ -13,3 +13,6 @@ FIDO_VERSION=${FIDO_MAJOR}.${FIDO_MINOR}
 CPPFLAGS+=-D_FIDO_MAJOR=${FIDO_MAJOR} -D_FIDO_MINOR=${FIDO_MINOR}
 CPPFLAGS+=-D_FIDO_PATCH=${FIDO_PATCH}
 CPPFLAGS+=-DHAVE_UNISTD_H -DHAVE_ARC4RANDOM_BUF -DHAVE_TIMESPECSUB
+
+LDFLAGS+=-lz
+DPFLAGS+=${LIBZ}
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/bin/fido2-assert/Makefile
--- a/external/bsd/libfido2/bin/fido2-assert/Makefile   Thu Jun 17 00:38:06 2021 +0000
+++ b/external/bsd/libfido2/bin/fido2-assert/Makefile   Thu Jun 17 01:15:44 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2020/03/03 00:14:17 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -6,9 +6,11 @@ BINDIR=/usr/bin
 
 PROG=  fido2-assert
 SRCS+=\
+config.c \
 assert_get.c \
 assert_verify.c \
 fido2-assert.c \
+largeblob.c \
 base64.c \
 bio.c \
 credman.c \
@@ -18,6 +20,7 @@ util.c
 
 SRCS+=\
 explicit_bzero.c \
+freezero.c \
 readpassphrase.c \
 recallocarray.c
 
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/bin/fido2-cred/Makefile
--- a/external/bsd/libfido2/bin/fido2-cred/Makefile     Thu Jun 17 00:38:06 2021 +0000
+++ b/external/bsd/libfido2/bin/fido2-cred/Makefile     Thu Jun 17 01:15:44 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2020/03/03 00:14:17 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -6,18 +6,21 @@ BINDIR=/usr/bin
 
 PROG=  fido2-cred
 SRCS+=\
+config.c \
 cred_make.c \
 cred_verify.c \
 base64.c \
 bio.c \
 credman.c \
 fido2-cred.c \
+largeblob.c \
 pin.c \
 token.c \
 util.c
 
 SRCS+=\
 explicit_bzero.c \
+freezero.c \
 readpassphrase.c \
 recallocarray.c
 
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/bin/fido2-token/Makefile
--- a/external/bsd/libfido2/bin/fido2-token/Makefile    Thu Jun 17 00:38:06 2021 +0000
+++ b/external/bsd/libfido2/bin/fido2-token/Makefile    Thu Jun 17 01:15:44 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2020/03/03 00:14:17 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -8,14 +8,17 @@ PROG= fido2-token
 SRCS+=\
 base64.c \
 bio.c \
+config.c \
 credman.c \
 fido2-token.c \
+largeblob.c \
 pin.c \
 token.c \
 util.c
 
 SRCS+=\
 explicit_bzero.c \
+freezero.c \
 readpassphrase.c \
 recallocarray.c
 
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/dist/.github/workflows/scan.yml
--- a/external/bsd/libfido2/dist/.github/workflows/scan.yml     Thu Jun 17 00:38:06 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-name: static code analysis
-
-on:
-  push:
-  schedule:
-    - cron: '0 0 * * 1'
-
-env:
-  SCAN_IMG:
-    yes-docker-local.artifactory.in.yubico.org/static-code-analysis/c:v1
-  SECRET: ${{ secrets.ARTIFACTORY_READER_TOKEN }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Scan but do not fail on warnings
-      run: |
-        if [ "${SECRET}" != "" ]; then
-          docker login yes-docker-local.artifactory.in.yubico.org/ \
-             -u svc-static-code-analysis-reader \
-             -p ${{ secrets.ARTIFACTORY_READER_TOKEN }}
-          docker pull ${SCAN_IMG}
-          docker run -v${PWD}:/k -e COMPILE_DEPS="${COMPILE_DEPS}" \
-             -e PROJECT_NAME=${GITHUB_REPOSITORY#Yubico/} -t ${SCAN_IMG}
-        fi
-      continue-on-error: true
-
-    - uses: actions/upload-artifact@master
-      if: failure()
-      with:
-        name: suppression_files
-        path: suppression_files
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/dist/.github/workflows/windows.yml
--- a/external/bsd/libfido2/dist/.github/workflows/windows.yml  Thu Jun 17 00:38:06 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-name: windows
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: build
-      run: .\windows\build.ps1
-
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/dist/.travis.yml
--- a/external/bsd/libfido2/dist/.travis.yml    Thu Jun 17 00:38:06 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-language: c
-
-matrix:
-  include:
-    - os: linux
-      compiler: clang-7
-      dist: xenial
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-7
-          packages:
-            - clang-7
-            - cmake
-            - libssl-dev
-            - libudev-dev
-      script: /bin/sh -eux .travis/build-linux-clang
-    - os: linux
-      compiler: gcc-7
-      dist: xenial
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-7
-            - cmake
-            - libssl-dev
-            - libudev-dev
-      script: /bin/sh -eux .travis/build-linux-gcc
-    - os: linux
-      compiler: i686-w64-mingw32-gcc-4.8
-      dist: xenial
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64
-            - g++-mingw-w64
-            - mingw-w64-i686-dev
-            - cmake
-      script: /bin/sh -eux .travis/build-linux-mingw
-    - os: osx
-      osx_image: xcode10.2
-      compiler: clang
-      sudo: required
-      script: /bin/sh -eux .travis/build-osx-clang
-    - os: linux
-      compiler: clang-7
-      dist: bionic
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-7
-          packages:
-            - clang-7
-            - cmake
-            - libssl-dev
-            - libudev-dev
-      script: /bin/sh -eux .travis/fuzz-linux-asan
-    - os: linux
-      compiler: clang-7
-      dist: bionic
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-7
-          packages:
-            - clang-7
-            - cmake
-            - libssl-dev
-            - libudev-dev
-      script: /bin/sh -eux .travis/fuzz-linux-msan
-
-notifications:
-  email: false
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/dist/.travis/build-linux-clang
--- a/external/bsd/libfido2/dist/.travis/build-linux-clang      Thu Jun 17 00:38:06 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#!/bin/sh -eux
-
-${CC} --version
-
-# Check exports.
-(cd src && ./diff_exports.sh)
-
-# Build and install libcbor.
-git clone git://github.com/pjk/libcbor
-cd libcbor
-git checkout v0.5.0
-mkdir build
-(cd build && cmake ..)
-make -C build
-sudo make -C build install
-cd ..
-
-# Build, analyze, and install libfido2.
-mkdir build
-(cd build && scan-build cmake -DCMAKE_BUILD_TYPE=Debug ..)
-scan-build --status-bugs make -C build
-sudo make -C build install
diff -r d3d0ea6018a6 -r 8cdf5131c4fb external/bsd/libfido2/dist/.travis/build-linux-gcc
--- a/external/bsd/libfido2/dist/.travis/build-linux-gcc        Thu Jun 17 00:38:06 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh -eux
-
-${CC} --version
-
-# Build and install libcbor.
-git clone git://github.com/pjk/libcbor
-cd libcbor
-git checkout v0.5.0
-mkdir build
-(cd build && cmake ..)
-make -C build
-sudo make -C build install
-cd ..
-
-# Build and install libfido2.
-mkdir build
-(cd build && cmake -DCMAKE_BUILD_TYPE=Debug ..)
-make -C build
-sudo make -C build install



Home | Main Index | Thread Index | Old Index