require Botan 2.14.0 (#1371)

* require Botan 2.14.0
rnpgp · Jan 21, 2021 · 24d0308 · 24d0308
1 parent 9bd348d
commit 24d0308
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml
@@ -20,7 +20,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     container:
       image: centos:7
-    timeout-minutes: 50
+    timeout-minutes: 70
     strategy:
       matrix:
         env:
@@ -163,7 +163,7 @@ jobs:
             find_package(BZip2 REQUIRED)
             find_package(ZLIB REQUIRED)
             find_package(JSON-C 0.11 REQUIRED)
-            find_package(Botan2 2.8.0 REQUIRED)
+            find_package(Botan2 2.14.0 REQUIRED)
             find_package(rnp REQUIRED)
 
             cmake_minimum_required(VERSION 3.12)

diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
@@ -18,10 +18,12 @@ jobs:
           - arch: x64
             os: windows-latest
             triplet: x64-windows
+            vcpkg_tag: 2020.11-1
             vcpkg_dir: 'C:\\vcpkg'
           - arch: Win32
             os: windows-latest
             triplet: x86-windows
+            vcpkg_tag: 2020.11-1
             vcpkg_dir: 'C:\\vcpkg'
 
     steps:
@@ -36,15 +38,13 @@ jobs:
         run: |
           cd ${{ matrix.vcpkg_dir }}
           git fetch origin --tags
-          git reset --hard 2020.06
+          git reset --hard ${{ matrix.vcpkg_tag }}
           ./bootstrap-vcpkg.bat
       - name: Cache vcpkg
         uses: actions/cache@v2
         with:
           path: '${{ matrix.vcpkg_dir }}/installed'
-          key: vcpkg-${{ matrix.triplet }}-${{ hashFiles('vcpkg.txt') }}
-          restore-keys: |
-            vcpkg-${{ matrix.triplet }}-
+          key: vcpkg-${{ matrix.triplet }}-${{ hashFiles('vcpkg.txt') }}-${{ matrix.vcpkg_tag }}
       - name: Install vcpkg packages
         shell: bash
         run: vcpkg install --triplet ${{ matrix.triplet }} $(cat vcpkg.txt)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -16,7 +16,7 @@ jobs:
   tests:
     runs-on: windows-latest
     if: "!contains(github.event.head_commit.message, 'skip ci')"
-    timeout-minutes: 50
+    timeout-minutes: 70
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/ci/before_install.sh b/ci/before_install.sh
@@ -91,8 +91,11 @@ msys_install() {
     mingw64/mingw-w64-x86_64-python3
   "
   pacman --noconfirm -S --needed ${packages}
-  botan_pkg="mingw-w64-x86_64-libbotan-2.13.0-1-any.pkg.tar.xz"
-  pacman --noconfirm -U http://repo.msys2.org/mingw/x86_64/${botan_pkg} || \
+  # any version starting with 2.14 up to 2.17.3 caused the application to hang
+  # as described in https://github.com/randombit/botan/issues/2582
+  # fixed with https://github.com/msys2/MINGW-packages/pull/7640/files
+  botan_pkg="mingw-w64-x86_64-libbotan-2.17.3-2-any.pkg.tar.zst"
+  pacman --noconfirm -U https://repo.msys2.org/mingw/x86_64/${botan_pkg} || \
   pacman --noconfirm -U https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/${botan_pkg}
 
   # msys includes ruby 2.6.1 while we need lower version

diff --git a/ci/install.sh b/ci/install.sh
@@ -16,7 +16,7 @@ function install_botan() {
       rm -rf "${botan_build}"
     fi
 
-    git clone --depth 1 --branch 2.13.0 https://github.com/randombit/botan "${botan_build}"
+    git clone --depth 1 --branch 2.17.3 https://github.com/randombit/botan "${botan_build}"
     pushd "${botan_build}"
 
     osparam=

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -31,7 +31,7 @@ find_package(ZLIB REQUIRED)
 
 # required packages
 find_package(JSON-C 0.11 REQUIRED)
-find_package(Botan2 2.8.0 REQUIRED)
+find_package(Botan2 2.14.0 REQUIRED)
 
 # generate a config.h
 include(CheckIncludeFileCXX)