openssh: fix PKCS#11 key enumeration and pin entry (#466079)

Author: philiptaron

pkgs/tools/networking/openssh/common.nix

@@ -67,9 +67,35 @@ stdenv.mkDerivation (finalAttrs: {
     # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
     ./dont_create_privsep_path.patch
 
+    # See discussion in https://github.com/NixOS/nixpkgs/issues/466049 and
+    # https://gitlab.archlinux.org/archlinux/packaging/packages/openssh/-/issues/23
+    (fetchpatch {
+      name = "pkcs11-fetchkey-error-to-debug.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/607f337637f2077b34a9f6f96fc24237255fe175.patch";
+      hunks = [ "2-" ];
+      hash = "sha256-rdvKL6/rwrdhGKlcmdy6fxVgJgaaRsmngX0KkShXAhQ=";
+    })
+    (fetchpatch {
+      name = "pkcs11-fix-pinentry.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/434ba7684054c0637ce8f2486aaacafe65d9b8aa.patch";
+      # only applies to Makefile.in (which doesn't have a date header) so no hunks= needed
+      hash = "sha256-3JQ3IJurngXclORrfC2Bx7xvmGA6w2nIh+eZ0zd0bLY=";
+    })
+
     # See discussion in https://github.com/NixOS/nixpkgs/issues/453782 and
     # https://github.com/openssh/openssh-portable/pull/602
-    ./fix_pkcs11_tests.patch
+    (fetchpatch {
+      name = "pkcs11-tests-allow-module-path.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/5e7c3f33b2693b668ecfbac84b85f2c0c84410c2.patch";
+      hunks = [ "2-" ];
+      hash = "sha256-mGpRGXurg8K9Wp8qoojG5MQ+3sZW2XKy2z0RDXLHaEc=";
+    })
+    (fetchpatch {
+      name = "ssh-agent-tests-increase-timeout.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/1fdc3c61194819c16063dc430eeb84b81bf42dcf.patch";
+      hunks = [ "2-" ];
+      hash = "sha256-b9YCOav32kY5VEvIG3W1fyD87HaQxof6Zwq9Oo+/Lac=";
+    })
   ]
   ++ extraPatches;