diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-04-29 17:19:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 17:19:19 +0200 |
| commit | 5ef56ad9f17993bda954e5c0527984b3d6fa570a (patch) | |
| tree | 9653e19e1929087ea898dd76460f95528cd5d6d0 | |
| parent | 5cf7af24768e8f2729f71add561fdeefb630a2fb (diff) | |
| parent | d4c033a206e7c275232e7d8c7724988f16b2250b (diff) | |
| download | nixpkgs-5ef56ad9f17993bda954e5c0527984b3d6fa570a.tar nixpkgs-5ef56ad9f17993bda954e5c0527984b3d6fa570a.tar.gz nixpkgs-5ef56ad9f17993bda954e5c0527984b3d6fa570a.tar.bz2 nixpkgs-5ef56ad9f17993bda954e5c0527984b3d6fa570a.tar.lz nixpkgs-5ef56ad9f17993bda954e5c0527984b3d6fa570a.tar.xz nixpkgs-5ef56ad9f17993bda954e5c0527984b3d6fa570a.tar.zst nixpkgs-5ef56ad9f17993bda954e5c0527984b3d6fa570a.zip | |
Merge pull request #121164 from dotlambda/botan-2.18.0
| -rw-r--r-- | pkgs/development/libraries/botan/2.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/botan/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/botan/generic.nix | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index cb40e535b0c..a486ba49820 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,9 +1,9 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.17"; - revision = "3"; - sha256 = "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr"; + baseVersion = "2.18"; + revision = "0"; + sha256 = "09z3fy31q1pvnvpy4fswrsl2aq8ksl94lbh5rl7b6nqc3qp8ar6c"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 8bcc6aaa8ef..c494fa25f77 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -9,4 +9,8 @@ callPackage ./generic.nix (args // { postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; + knownVulnerabilities = [ + # https://botan.randombit.net/security.html#id1 + "2020-03-24: Side channel during CBC padding" + ]; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 33f9daf7b50..2fc5abc2928 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -4,6 +4,7 @@ , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , postPatch ? null +, knownVulnerabilities ? [ ] , CoreServices , Security , ... @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.bsd2; + inherit knownVulnerabilities; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; } |