From a54456637b96bfa7cd2d3ca837c67bdc0c913b51 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 16 Jul 2024 12:43:17 +0200 Subject: [PATCH 1/2] botan3: 3.4.0 -> 3.5.0 Changelog: https://botan.randombit.net/news.html#version-3-5-0-2024-07-08 CVEs fixed: - CVE-2024-34702: Fix a DoS caused by excessive name constraints. (GH #4186) - CVE-2024-39312: Fix a name constraint processing error, where if permitted and excluded rules both applied to a certificate, only the permitted rules would be checked. Notable changes: - Add support for LMS hash based signatures - Performance optimizations for XTS and ECC (started) Signed-off-by: Markus Theil --- pkgs/development/libraries/botan/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix index d3cd0ece00df..0cffb67104c6 100644 --- a/pkgs/development/libraries/botan/3.0.nix +++ b/pkgs/development/libraries/botan/3.0.nix @@ -1,9 +1,9 @@ { callPackage, stdenv, lib, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "3.4"; + baseVersion = "3.5"; revision = "0"; - hash = "sha256-cYQ6/MCixYX48z+jBPC1iuS5xdgwb4lGZ7N0YEQndVc="; + hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again extraPatches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; }) From 4e5416b094a0c64e6c9ab97891247f06e42519c1 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 16 Jul 2024 12:45:31 +0200 Subject: [PATCH 2/2] botan2: 2.19.4 -> 2.19.5 Changelog: https://botan.randombit.net/news.html#version-2-19-5-2024-07-08 CVEs fixed: - CVE-2024-34702: Fix a DoS caused by excessive name constraints. (GH #4187) - CVE-2024-39312: Fix a name constraint processing error, where if permitted and excluded rules both applied to a certificate, only the permitted rules would be checked. (GH #4187) Other changes: - Fix a crash in OCB The authors of botan also added the following to the changelog: "A reminder that Botan2 reaches end of life at the end of 2024" Signed-off-by: Markus Theil --- pkgs/development/libraries/botan/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index c9a45218dfb4..c14fdb4cef1f 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix (args // { baseVersion = "2.19"; - revision = "4"; - hash = "sha256-WjqI72Qz6XvKsO+h7WDGGX5K2p2dMLwcR0N7+JuX8nY="; + revision = "5"; + hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; })