From 6e1c1a9c2860bdaadfe21504c6082f9065f83d1f Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 7 Apr 2024 09:32:00 -0400 Subject: [PATCH] diffoscope: fix build after disablement of OpenSSH DSA keys Caused by 6ee4b8c8bf815567f7d0fa131576d2b8c0a18167. See also https://hydra.nixos.org/build/255480862. --- pkgs/tools/misc/diffoscope/default.nix | 1 + .../misc/diffoscope/openssh-no-dsa.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/diffoscope/openssh-no-dsa.patch diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 171cbc2dfe72..cec60f83471d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -93,6 +93,7 @@ python3.pkgs.buildPythonApplication rec { patches = [ ./ignore_links.patch + ./openssh-no-dsa.patch # https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/139 ]; postPatch = '' diff --git a/pkgs/tools/misc/diffoscope/openssh-no-dsa.patch b/pkgs/tools/misc/diffoscope/openssh-no-dsa.patch new file mode 100644 index 000000000000..d8e88f30a92d --- /dev/null +++ b/pkgs/tools/misc/diffoscope/openssh-no-dsa.patch @@ -0,0 +1,29 @@ +diff --git a/tests/comparators/test_openssh_pub_key.py b/tests/comparators/test_openssh_pub_key.py +index da143097..8d6f3efa 100644 +--- a/tests/comparators/test_openssh_pub_key.py ++++ b/tests/comparators/test_openssh_pub_key.py +@@ -29,7 +29,7 @@ + from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least + + +-# Generated by: ssh-keygen -t dsa -C "Test1" ++# Generated by: ssh-keygen -t ed25519 -C "Test1" + opensshpubkey1 = load_fixture("test_openssh_pub_key1.pub") + # Generated by: ssh-keygen -t rsa -b 4096 -C "Test2" + opensshpubkey2 = load_fixture("test_openssh_pub_key2.pub") +diff --git a/tests/data/openssh_pub_key_expected_diff b/tests/data/openssh_pub_key_expected_diff +index 0b6ec624..88d1eccf 100644 +--- a/tests/data/openssh_pub_key_expected_diff ++++ b/tests/data/openssh_pub_key_expected_diff +@@ -1,3 +1,3 @@ + @@ -1 +1 @@ +--1024 SHA256:v/O+0ETvi2H5TGRXky1RhQ1/WFwLlPpxch5E2Mrj6FM Test1 (DSA) ++-256 SHA256:ix2OOXDuTWjxGTICJcP7fLWIcwOO+wr4FPJHz8fOhtQ Test1 (ED25519) + +4096 SHA256:9dH1CMkA6DSfPWU7vNwdPKS5/ppN4LMdvHTP60l7aSA Test2 (RSA) +diff --git a/tests/data/test_openssh_pub_key1.pub b/tests/data/test_openssh_pub_key1.pub +index a2674adc..d564f55c 100644 +--- a/tests/data/test_openssh_pub_key1.pub ++++ b/tests/data/test_openssh_pub_key1.pub +@@ -1 +1 @@ +-ssh-dss AAAAB3NzaC1kc3MAAACBAIa8YajID9g38jwQm8sNBGoGkkwIOv6sQ8k+Bcq8oPXPy1FRXWcra6Kd3iKqApIzLuZUvoYO/f3G2K4lue5yrv72rgwANWmyL4dHVXgcsjwvWwjOl6o4xWTPFspkdNcAAMcZfzG0+w1AOkQxhwMsnK380m3J9a3VOWugUiU4fV1jAAAAFQDzkrIZuJoxlxes564ltb2Vn3hnpQAAAIBHr6uzpiSeSkWLuItB00hHx1RHtBns0zaheNFTTUMGftxtfBU2eBLqObcTlqHJZ3UUY3/YAvD6Ux/uLSgUzEe7JaqvHcgML3K5V4HWIwE0ARRIwzrfU4cAErJObmZZ/OXbXNNRmW2IJgQJI52x4gVuSt0EEuctzASOOvyPA8IekAAAAIA7xe4o0o/ZwUqfWKR9K4QrbPPa6/D4ruFVhMcRJEE/A1LMY1Xo4nVSRU5bxzvMmJPBZvsbR5NEE3CgESqYxp5IPzK8LLyxcf8YxhdHFDYqFL1TbavwaDqtj6/9a/e7+bd8mMYe7zXJUdKWa/Uf+Xm6WRt3HgdLiCEsS2OlpvS2KA== Test1 ++ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGo65kxbPUbb4fdujB2AX/XEZQ+23NDDxu3cJvw2E/DF Test1