diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-03-20 05:48:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-03-20 05:48:26 +0000 |
| commit | 5ecff9f7b2a88bd7665a093652f7fe7b17dc3d0a (patch) | |
| tree | ff8543f4478927eddb7388c1e431565181349005 /net-misc/openssh/files | |
| parent | Version bump for testing. (diff) | |
| download | historical-5ecff9f7b2a88bd7665a093652f7fe7b17dc3d0a.tar.gz historical-5ecff9f7b2a88bd7665a093652f7fe7b17dc3d0a.tar.bz2 historical-5ecff9f7b2a88bd7665a093652f7fe7b17dc3d0a.zip | |
Fix openssl version check to accept dev/beta/release versions.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch b/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch new file mode 100644 index 000000000000..2f614104de4e --- /dev/null +++ b/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch @@ -0,0 +1,15 @@ +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. + +--- a/entropy.c ++++ b/entropy.c +@@ -216,7 +216,7 @@ seed_rng(void) + * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed + * within a patch series. + */ +- u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L; ++ u_long version_mask = SSLeay() >= 0x1000000f ? ~0xfffffL : ~0xff0L; + if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) || + (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12)) + fatal("OpenSSL version mismatch. Built against %lx, you " |