From 0721653c6040b072129fc36d5c62a13966c7ef24 Mon Sep 17 00:00:00 2001 From: Ludvig Michaelsson Date: Tue, 3 Jan 2023 08:50:42 +0100 Subject: [PATCH] actions/fuzz: additional bump of libcbor to 0.10.1 While here, bump the version of the fuzzing Docker image. --- .actions/build-linux-i686-w64-mingw32-gcc | 4 ++-- .actions/build-linux-openssl3-i686-w64-mingw32-gcc | 4 ++-- fuzz/Dockerfile | 4 ++-- fuzz/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.actions/build-linux-i686-w64-mingw32-gcc b/.actions/build-linux-i686-w64-mingw32-gcc index 2e6027bb..a2c4f565 100755 --- a/.actions/build-linux-i686-w64-mingw32-gcc +++ b/.actions/build-linux-i686-w64-mingw32-gcc @@ -1,6 +1,6 @@ #!/bin/sh -eux -# Copyright (c) 2022 Yubico AB. All rights reserved. +# Copyright (c) 2022-2023 Yubico AB. All rights reserved. # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. # SPDX-License-Identifier: BSD-2-Clause @@ -23,7 +23,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) EOF # Build and install libcbor. -git clone --depth=1 https://github.com/pjk/libcbor -b v0.9.0 +git clone --depth=1 https://github.com/pjk/libcbor -b v0.10.1 cd libcbor mkdir build (cd build && cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/mingw.cmake \ diff --git a/.actions/build-linux-openssl3-i686-w64-mingw32-gcc b/.actions/build-linux-openssl3-i686-w64-mingw32-gcc index f634623f..b76f3745 100755 --- a/.actions/build-linux-openssl3-i686-w64-mingw32-gcc +++ b/.actions/build-linux-openssl3-i686-w64-mingw32-gcc @@ -1,6 +1,6 @@ #!/bin/sh -eux -# Copyright (c) 2022 Yubico AB. All rights reserved. +# Copyright (c) 2022-2023 Yubico AB. All rights reserved. # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. # SPDX-License-Identifier: BSD-2-Clause @@ -23,7 +23,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) EOF # Build and install libcbor. -git clone --depth=1 https://github.com/pjk/libcbor -b v0.9.0 +git clone --depth=1 https://github.com/pjk/libcbor -b v0.10.1 cd libcbor mkdir build (cd build && cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/mingw.cmake \ diff --git a/fuzz/Dockerfile b/fuzz/Dockerfile index 0c99f2c9..9cda3758 100644 --- a/fuzz/Dockerfile +++ b/fuzz/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022 Yubico AB. All rights reserved. +# Copyright (c) 2019-2023 Yubico AB. All rights reserved. # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. # SPDX-License-Identifier: BSD-2-Clause @@ -10,7 +10,7 @@ RUN apk -q update RUN apk add build-base clang clang-analyzer cmake compiler-rt coreutils RUN apk add eudev-dev git linux-headers llvm openssl-dev pcsc-lite-dev RUN apk add sudo tar zlib-dev -RUN git clone --branch v0.9.0 --depth=1 https://github.com/PJK/libcbor +RUN git clone --branch v0.10.1 --depth=1 https://github.com/PJK/libcbor RUN git clone --depth=1 https://github.com/yubico/libfido2 WORKDIR /libfido2 RUN ./fuzz/build-coverage /libcbor /libfido2 diff --git a/fuzz/Makefile b/fuzz/Makefile index 40df46ca..0e6756f0 100644 --- a/fuzz/Makefile +++ b/fuzz/Makefile @@ -1,9 +1,9 @@ -# Copyright (c) 2019-2022 Yubico AB. All rights reserved. +# Copyright (c) 2019-2023 Yubico AB. All rights reserved. # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. # SPDX-License-Identifier: BSD-2-Clause -IMAGE := libfido2-coverage:1.13.0 +IMAGE := libfido2-coverage:1.13.1 RUNNER := libfido2-runner PROFDATA := llvm-profdata COV := llvm-cov