Skip to content

Commit 2c13cbc

Browse files
tgauthtgauth
committed
Merge tag 'tags/1.15.0'
release 1.15.0
2 parents 52bb909 + f87c19c commit 2c13cbc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1415
-326
lines changed

‎.actions/build-bsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cat > "${MANIFEST}" <<- EOF
1515
image: ${IMAGE}
1616
packages:
1717
- cmake
18-
- llvm
18+
- llvm${LLVM_VERSION:+%${LLVM_VERSION}}
1919
- pcsc-lite
2020
EOF
2121

@@ -38,7 +38,7 @@ tasks:
3838
else
3939
SUDO=sudo
4040
fi
41-
SCAN="/usr/local/bin/scan-build --use-cc=/usr/bin/cc --status-bugs"
41+
SCAN="/usr/local/bin/scan-build${LLVM_VERSION:+-${LLVM_VERSION}} --use-cc=/usr/bin/cc --status-bugs"
4242
cd libfido2
4343
for T in Debug Release; do
4444
mkdir build-\$T

‎.actions/build-linux-i686-w64-mingw32-gcc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh -eux
22

3-
# Copyright (c) 2022-2023 Yubico AB. All rights reserved.
3+
# Copyright (c) 2022-2024 Yubico AB. All rights reserved.
44
# Use of this source code is governed by a BSD-style
55
# license that can be found in the LICENSE file.
66
# SPDX-License-Identifier: BSD-2-Clause
@@ -23,7 +23,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
2323
EOF
2424

2525
# Build and install libcbor.
26-
git clone --depth=1 https://github.com/pjk/libcbor -b v0.10.1
26+
git clone --depth=1 https://github.com/pjk/libcbor -b v0.11.0
2727
cd libcbor
2828
mkdir build
2929
(cd build && cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/mingw.cmake \
@@ -42,7 +42,7 @@ sudo make install_sw
4242
cd ..
4343

4444
# Build and install zlib.
45-
git clone --depth=1 https://github.com/madler/zlib -b v1.3
45+
git clone --depth=1 https://github.com/madler/zlib -b v1.3.1
4646
cd zlib
4747
make -fwin32/Makefile.gcc PREFIX=i686-w64-mingw32-
4848
sudo make -fwin32/Makefile.gcc PREFIX=i686-w64-mingw32- DESTDIR=/fakeroot \

‎.actions/build-linux-openssl3-clang‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh -eux
22

3-
# Copyright (c) 2022 Yubico AB. All rights reserved.
3+
# Copyright (c) 2022-2024 Yubico AB. All rights reserved.
44
# Use of this source code is governed by a BSD-style
55
# license that can be found in the LICENSE file.
66
# SPDX-License-Identifier: BSD-2-Clause
@@ -12,8 +12,8 @@ FAKEROOT="$(mktemp -d)"
1212
# Check exports.
1313
(cd src && ./diff_exports.sh)
1414

15-
# Build and install OpenSSL 3.0.12.
16-
git clone --branch openssl-3.0.12 \
15+
# Build and install OpenSSL 3.0.14.
16+
git clone --branch openssl-3.0.14 \
1717
--depth=1 https://github.com/openssl/openssl
1818
cd openssl
1919
./Configure linux-x86_64-clang --prefix="${FAKEROOT}" \

‎.actions/build-linux-openssl3-gcc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/sh -eux
22

3-
# Copyright (c) 2022 Yubico AB. All rights reserved.
3+
# Copyright (c) 2022-2024 Yubico AB. All rights reserved.
44
# Use of this source code is governed by a BSD-style
55
# license that can be found in the LICENSE file.
66
# SPDX-License-Identifier: BSD-2-Clause
77

88
${CC} --version
99
FAKEROOT="$(mktemp -d)"
1010

11-
# Build and install OpenSSL 3.0.12.
12-
git clone --branch openssl-3.0.12 \
11+
# Build and install OpenSSL 3.0.14.
12+
git clone --branch openssl-3.0.14 \
1313
--depth=1 https://github.com/openssl/openssl
1414
cd openssl
1515
./Configure linux-x86_64 --prefix="${FAKEROOT}" \

‎.actions/build-linux-openssl3-i686-w64-mingw32-gcc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh -eux
22

3-
# Copyright (c) 2022-2023 Yubico AB. All rights reserved.
3+
# Copyright (c) 2022-2024 Yubico AB. All rights reserved.
44
# Use of this source code is governed by a BSD-style
55
# license that can be found in the LICENSE file.
66
# SPDX-License-Identifier: BSD-2-Clause
@@ -23,7 +23,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
2323
EOF
2424

2525
# Build and install libcbor.
26-
git clone --depth=1 https://github.com/pjk/libcbor -b v0.10.1
26+
git clone --depth=1 https://github.com/pjk/libcbor -b v0.11.0
2727
cd libcbor
2828
mkdir build
2929
(cd build && cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/mingw.cmake \
@@ -32,8 +32,8 @@ make -j"$(nproc)" -C build
3232
sudo make -C build install
3333
cd ..
3434

35-
# Build and install OpenSSL 3.0.11.
36-
git clone --branch openssl-3.0.12 \
35+
# Build and install OpenSSL 3.0.14.
36+
git clone --branch openssl-3.0.14 \
3737
--depth=1 https://github.com/openssl/openssl
3838
cd openssl
3939
./Configure mingw --prefix=/fakeroot --openssldir=/fakeroot/openssl \
@@ -43,7 +43,7 @@ sudo make install_sw
4343
cd ..
4444

4545
# Build and install zlib.
46-
git clone --depth=1 https://github.com/madler/zlib -b v1.3
46+
git clone --depth=1 https://github.com/madler/zlib -b v1.3.1
4747
cd zlib
4848
make -fwin32/Makefile.gcc PREFIX=i686-w64-mingw32-
4949
sudo make -fwin32/Makefile.gcc PREFIX=i686-w64-mingw32- DESTDIR=/fakeroot \

‎.actions/fuzz-linux‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#!/bin/sh -eux
22

3-
# Copyright (c) 2020-2022 Yubico AB. All rights reserved.
3+
# Copyright (c) 2020-2024 Yubico AB. All rights reserved.
44
# Use of this source code is governed by a BSD-style
55
# license that can be found in the LICENSE file.
66
# SPDX-License-Identifier: BSD-2-Clause
77

88
LIBCBOR_URL="https://github.com/pjk/libcbor"
9-
LIBCBOR_TAG="v0.10.2"
9+
LIBCBOR_TAG="v0.11.0"
1010
LIBCBOR_ASAN="address alignment bounds"
1111
LIBCBOR_MSAN="memory"
1212
OPENSSL_URL="https://github.com/openssl/openssl"
13-
OPENSSL_TAG="openssl-3.0.12"
13+
OPENSSL_TAG="openssl-3.0.14"
1414
ZLIB_URL="https://github.com/madler/zlib"
15-
ZLIB_TAG="v1.3"
15+
ZLIB_TAG="v1.3.1"
1616
ZLIB_ASAN="address alignment bounds undefined"
1717
ZLIB_MSAN="memory"
1818
FIDO2_ASAN="address bounds fuzzer-no-link implicit-conversion leak"
@@ -63,6 +63,7 @@ git clone --depth=1 "${OPENSSL_URL}" -b "${OPENSSL_TAG}"
6363
cd openssl
6464
./Configure linux-x86_64-clang "enable-$1" --prefix="${FAKEROOT}" \
6565
--openssldir="${FAKEROOT}/openssl" --libdir=lib
66+
make -j"$(nproc)" build_sw
6667
make install_sw
6768
cd -
6869

@@ -71,7 +72,7 @@ git clone --depth=1 "${ZLIB_URL}" -b "${ZLIB_TAG}"
7172
cd zlib
7273
CFLAGS="${ZLIB_CFLAGS}" LDFLAGS="${ZLIB_CFLAGS}" ./configure \
7374
--prefix="${FAKEROOT}"
74-
make install
75+
make -j"$(nproc)" install
7576
cd -
7677

7778
# libfido2
@@ -87,7 +88,7 @@ mkdir corpus
8788
curl -s https://storage.googleapis.com/yubico-libfido2/corpus.tgz |
8889
tar -C corpus -zxf -
8990
export UBSAN_OPTIONS ASAN_OPTIONS MSAN_OPTIONS
90-
for f in assert bio cred credman hid largeblob mgmt netlink pcsc; do
91+
for f in assert attobj bio cred credman hid largeblob mgmt netlink pcsc; do
9192
build/fuzz/fuzz_${f} -use_value_profile=1 -reload=30 -print_pcs=1 \
9293
-print_funcs=30 -timeout=10 -runs=1 corpus/fuzz_${f}
9394
done

‎.github/workflows/alpine_builds.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
build:
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
2020
container: alpine:latest
2121
strategy:
2222
fail-fast: false

‎.github/workflows/bsd_builds.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
image: [freebsd/13.x, openbsd/7.2]
21+
include:
22+
- { image: freebsd/14.x }
23+
- { image: openbsd/7.4, llvm_version: 16 }
2224
steps:
2325
- uses: actions/checkout@v4
2426
- name: dependencies
@@ -27,6 +29,7 @@ jobs:
2729
sudo apt install -q -y curl jq
2830
- name: build
2931
env:
32+
LLVM_VERSION: ${{ matrix.llvm_version }}
3033
IMAGE: ${{ matrix.image }}
3134
SOURCEHUT_TOKEN: ${{ secrets.SOURCEHUT_TOKEN }}
3235
run: ./.actions/build-bsd

‎.github/workflows/cifuzz_oss.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
fuzzing:
1919
if: github.repository == 'Yubico/libfido2'
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: false
2323
matrix:

‎.github/workflows/linux_builds.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
- { os: ubuntu-22.04, cc: gcc-10 }
2727
- { os: ubuntu-22.04, cc: gcc-11 }
2828
- { os: ubuntu-22.04, cc: gcc-12 }
29-
- { os: ubuntu-22.04, cc: clang-13 }
30-
- { os: ubuntu-22.04, cc: clang-14 }
3129
- { os: ubuntu-22.04, cc: clang-15 }
3230
- { os: ubuntu-22.04, cc: clang-16 }
31+
- { os: ubuntu-22.04, cc: clang-17 }
32+
- { os: ubuntu-22.04, cc: clang-18 }
3333
- { os: ubuntu-20.04, cc: i686-w64-mingw32-gcc-9 }
3434
- { os: ubuntu-22.04, cc: i686-w64-mingw32-gcc-10 }
3535
steps:

0 commit comments

Comments
 (0)