From f7dcc5db3065338bf5b1951ca897cb0042de2c8f Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Thu, 19 May 2022 16:08:05 -0700 Subject: [PATCH] net-misc/openssh: Bump 9.0_p1 to fix random hangs with X509 Signed-off-by: Patrick McLean --- .../openssh-9.0_p1-X509-uninitialized-delay.patch | 12 ++++++++++++ ...penssh-9.0_p1.ebuild => openssh-9.0_p1-r1.ebuild} | 1 + 2 files changed, 13 insertions(+) create mode 100644 net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch rename net-misc/openssh/{openssh-9.0_p1.ebuild => openssh-9.0_p1-r1.ebuild} (99%) diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch new file mode 100644 index 0000000000000..2a83ed37d1387 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch @@ -0,0 +1,12 @@ +diff -ur a/auth2.c b/auth2.c +--- a/auth2.c 2022-05-19 15:59:32.875160028 -0700 ++++ b/auth2.c 2022-05-19 16:03:44.291594908 -0700 +@@ -226,7 +226,7 @@ + int digest_alg; + size_t len; + u_char *hash; +- double delay; ++ double delay = 0; + + digest_alg = ssh_digest_maxbytes(); + if (len = ssh_digest_bytes(digest_alg) > 0) { diff --git a/net-misc/openssh/openssh-9.0_p1.ebuild b/net-misc/openssh/openssh-9.0_p1-r1.ebuild similarity index 99% rename from net-misc/openssh/openssh-9.0_p1.ebuild rename to net-misc/openssh/openssh-9.0_p1-r1.ebuild index 13c0bb4fa5c50..9fc26e8968bf6 100644 --- a/net-misc/openssh/openssh-9.0_p1.ebuild +++ b/net-misc/openssh/openssh-9.0_p1-r1.ebuild @@ -149,6 +149,7 @@ src_prepare() { popd &>/dev/null || die eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch" # We need to patch package version or any X.509 sshd will reject our ssh client # with "userauth_pubkey: could not parse key: string is too large [preauth]"