summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2022-05-19 16:08:05 -0700
committerPatrick McLean <chutzpah@gentoo.org>2022-05-19 16:08:33 -0700
commitf7dcc5db3065338bf5b1951ca897cb0042de2c8f (patch)
treef47467a152d94acb04b7ca82576b6bb3eaf65b30 /net-misc/openssh
parentmedia-libs/xine-lib: drop 1.2.12-r1 (diff)
downloadgentoo-f7dcc5db3065338bf5b1951ca897cb0042de2c8f.tar.gz
gentoo-f7dcc5db3065338bf5b1951ca897cb0042de2c8f.tar.bz2
gentoo-f7dcc5db3065338bf5b1951ca897cb0042de2c8f.zip
net-misc/openssh: Bump 9.0_p1 to fix random hangs with X509
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch12
-rw-r--r--net-misc/openssh/openssh-9.0_p1-r1.ebuild (renamed from net-misc/openssh/openssh-9.0_p1.ebuild)1
2 files changed, 13 insertions, 0 deletions
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 000000000000..2a83ed37d138
--- /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
index 13c0bb4fa5c5..9fc26e8968bf 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]"