vapier      14/03/20 05:48:24

  Added:                openssh-6.6_p1-openssl-ignore-status.patch
  Log:
  Fix openssl version check to accept dev/beta/release versions.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
D2E96200)

Revision  Changes    Path
1.1                  
net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch?rev=1.1&content-type=text/plain

Index: openssh-6.6_p1-openssl-ignore-status.patch
===================================================================
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 "




Reply via email to