diff options
author | Sam James <sam@gentoo.org> | 2023-03-23 05:59:32 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-03-23 05:59:59 +0000 |
commit | d98d3e95b9bd0a5d29463710ece356005e70cb93 (patch) | |
tree | 21c84c1744a06c56579851e346d6bf63ebd790c4 /net-misc/openssh/files | |
parent | sys-fs/cryptsetup: add 2.6.1 (diff) | |
download | gentoo-d98d3e95b9bd0a5d29463710ece356005e70cb93.tar.gz gentoo-d98d3e95b9bd0a5d29463710ece356005e70cb93.tar.bz2 gentoo-d98d3e95b9bd0a5d29463710ece356005e70cb93.zip |
net-misc/openssh: drop 9.1_p1-r3, 9.2_p1-r3
Bug: https://bugs.gentoo.org/892936
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/openssh/files')
-rw-r--r-- | net-misc/openssh/files/openssh-9.1_p2-openssl-version-compat-check.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/net-misc/openssh/files/openssh-9.1_p2-openssl-version-compat-check.patch b/net-misc/openssh/files/openssh-9.1_p2-openssl-version-compat-check.patch deleted file mode 100644 index 530d96e11ce2..000000000000 --- a/net-misc/openssh/files/openssh-9.1_p2-openssl-version-compat-check.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugzilla.mindrot.org/show_bug.cgi?id=3548 ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -33,10 +33,10 @@ - - /* - * OpenSSL version numbers: MNNFFPPS: major minor fix patch status -- * We match major, minor, fix and status (not patch) for <1.0.0. -- * After that, we acceptable compatible fix versions (so we -- * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed -- * within a patch series. -+ * Versions >=3 require only major versions to match. -+ * For versions <3, we accept compatible fix versions (so we allow 1.0.1 -+ * to work with 1.0.0). Going backwards is only allowed within a patch series. -+ * See https://www.openssl.org/policies/releasestrat.html - */ - - int -@@ -48,15 +48,17 @@ ssh_compatible_openssl(long headerver, long libver) - if (headerver == libver) - return 1; - -- /* for versions < 1.0.0, major,minor,fix,status must match */ -- if (headerver < 0x1000000f) { -- mask = 0xfffff00fL; /* major,minor,fix,status */ -+ /* -+ * For versions >= 3.0, only the major and status must match. -+ */ -+ if (headerver >= 0x3000000f) { -+ mask = 0xf000000fL; /* major,status */ - return (headerver & mask) == (libver & mask); - } - - /* -- * For versions >= 1.0.0, major,minor,status must match and library -- * fix version must be equal to or newer than the header. -+ * For versions >= 1.0.0, but <3, major,minor,status must match and -+ * library fix version must be equal to or newer than the header. - */ - mask = 0xfff0000fL; /* major,minor,status */ - hfix = (headerver & 0x000ff000) >> 12; - |