Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

actions: bump dependencies #739

Merged
merged 6 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .actions/build-linux-i686-w64-mingw32-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ make -j"$(nproc)" -C build
sudo make -C build install
cd ..

# Build and install OpenSSL 1.1.1v.
git clone --depth=1 https://github.com/openssl/openssl -b OpenSSL_1_1_1v
# Build and install OpenSSL 1.1.1w.
git clone --depth=1 https://github.com/openssl/openssl -b OpenSSL_1_1_1w
cd openssl
./Configure mingw --prefix=/fakeroot --openssldir=/fakeroot/openssl \
--cross-compile-prefix=i686-w64-mingw32-
Expand Down
4 changes: 2 additions & 2 deletions .actions/build-linux-openssl3-clang
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ FAKEROOT="$(mktemp -d)"
# Check exports.
(cd src && ./diff_exports.sh)

# Build and install OpenSSL 3.0.11.
git clone --branch openssl-3.0.11 \
# Build and install OpenSSL 3.0.12.
git clone --branch openssl-3.0.12 \
--depth=1 https://github.com/openssl/openssl
cd openssl
./Configure linux-x86_64-clang --prefix="${FAKEROOT}" \
Expand Down
4 changes: 2 additions & 2 deletions .actions/build-linux-openssl3-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
${CC} --version
FAKEROOT="$(mktemp -d)"

# Build and install OpenSSL 3.0.11.
git clone --branch openssl-3.0.11 \
# Build and install OpenSSL 3.0.12.
git clone --branch openssl-3.0.12 \
--depth=1 https://github.com/openssl/openssl
cd openssl
./Configure linux-x86_64 --prefix="${FAKEROOT}" \
Expand Down
2 changes: 1 addition & 1 deletion .actions/build-linux-openssl3-i686-w64-mingw32-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sudo make -C build install
cd ..

# Build and install OpenSSL 3.0.11.
git clone --branch openssl-3.0.11 \
git clone --branch openssl-3.0.12 \
--depth=1 https://github.com/openssl/openssl
cd openssl
./Configure mingw --prefix=/fakeroot --openssldir=/fakeroot/openssl \
Expand Down
4 changes: 2 additions & 2 deletions .actions/fuzz-linux
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# SPDX-License-Identifier: BSD-2-Clause

LIBCBOR_URL="https://github.com/pjk/libcbor"
LIBCBOR_TAG="v0.10.1"
LIBCBOR_TAG="v0.10.2"
LIBCBOR_ASAN="address alignment bounds"
LIBCBOR_MSAN="memory"
OPENSSL_URL="https://github.com/openssl/openssl"
OPENSSL_TAG="openssl-3.0.11"
OPENSSL_TAG="openssl-3.0.12"
ZLIB_URL="https://github.com/madler/zlib"
ZLIB_TAG="v1.3"
ZLIB_ASAN="address alignment bounds undefined"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/alpine_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: fix permissions on workdir
run: chown root:wheel "${GITHUB_WORKSPACE}"
- name: checkout libfido2
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: build libfido2
env:
CC: ${{ matrix.cc }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bsd_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
image: [freebsd/13.x, openbsd/7.2]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: dependencies
run: |
sudo apt -q update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz_oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fuzz-seconds: 600
dry-run: false
- name: upload crash
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v3
if: failure()
with:
name: ${{ matrix.sanitizer }}-artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: init codeql
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cygwin_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
arch: [ x64 ]
config: [ "Debug", "Release" ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build
run: |
.\windows\cygwin.ps1 -Config ${{ matrix.config }}
2 changes: 1 addition & 1 deletion .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- { os: ubuntu-20.04, cc: i686-w64-mingw32-gcc-9 }
- { os: ubuntu-22.04, cc: i686-w64-mingw32-gcc-10 }
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: dependencies
run: |
sudo apt -q update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
cc: [ clang-16 ]
sanitizer: [ asan, msan ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: dependencies
run: |
sudo apt -q update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
os: [ macos-13, macos-12, macos-11 ]
cc: [ clang ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: dependencies
run: brew install libcbor llvm mandoc [email protected] pkg-config zlib
- name: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openssl3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- os: ubuntu-22.04
cc: i686-w64-mingw32-gcc-10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: dependencies
env:
CC: ${{ matrix.cc }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
type: [ dynamic, static ]
config: [ "Release" ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build
run: |
.\windows\build.ps1 -Fido2Flags '/analyze' -Arch ${{ matrix.arch }} `
Expand Down
2 changes: 1 addition & 1 deletion fuzz/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.1 --depth=1 https://github.com/PJK/libcbor
RUN git clone --branch v0.10.2 --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
6 changes: 3 additions & 3 deletions windows/const.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

# LibreSSL coordinates.
New-Variable -Name 'LIBRESSL_URL' `
-Value 'https://cdn.openbsd.org/pub/OpenBSD/LibreSSL' `
-Value 'https://cloudflare.cdn.openbsd.org/pub/OpenBSD/LibreSSL' `
-Option Constant
New-Variable -Name 'LIBRESSL' -Value 'libressl-3.7.3' -Option Constant
New-Variable -Name 'CRYPTO_LIBRARIES' -Value 'crypto-50' -Option Constant

# libcbor coordinates.
New-Variable -Name 'LIBCBOR' -Value 'libcbor-0.10.1' -Option Constant
New-Variable -Name 'LIBCBOR_BRANCH' -Value 'v0.10.1' -Option Constant
New-Variable -Name 'LIBCBOR' -Value 'libcbor-0.10.2' -Option Constant
New-Variable -Name 'LIBCBOR_BRANCH' -Value 'v0.10.2' -Option Constant
New-Variable -Name 'LIBCBOR_GIT' -Value 'https://github.com/pjk/libcbor' `
-Option Constant

Expand Down