summaryrefslogtreecommitdiff
path: root/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-31 12:22:51 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-31 12:22:51 +0100
commitd7a889ce352aac45558b4fedd0b3acec068feee7 (patch)
tree03e5ecd35aaf673fc22a3c6cbaa23301322112f9 /net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
parent175ebd93121e0747f868e95f4b542af43ad2a02f (diff)
net-misc/openssh : import from gentoo, do not force newer linux-headers since we don't run glibc2.31 (https://bugs.gentoo.org/708224)
Diffstat (limited to 'net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch')
-rw-r--r--net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch b/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
new file mode 100644
index 00000000..fa33af39
--- /dev/null
+++ b/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
@@ -0,0 +1,17 @@
+the last nibble of the openssl version represents the status. that is,
+whether it is a beta or release. when it comes to version checks in
+openssh, this component does not matter, so ignore it.
+
+https://bugzilla.mindrot.org/show_bug.cgi?id=2212
+
+--- a/openbsd-compat/openssl-compat.c
++++ b/openbsd-compat/openssl-compat.c
+@@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver)
+ * For versions >= 1.0.0, major,minor,status must match and library
+ * fix version must be equal to or newer than the header.
+ */
+- mask = 0xfff0000fL; /* major,minor,status */
++ mask = 0xfff00000L; /* major,minor,status */
+ hfix = (headerver & 0x000ff000) >> 12;
+ lfix = (libver & 0x000ff000) >> 12;
+ if ( (headerver & mask) == (libver & mask) && lfix >= hfix)