openssh-6.7_p1-openssl-ignore-status.patch 765 B

123456789101112131415161718
  1. the last nibble of the openssl version represents the status. that is,
  2. whether it is a beta or release. when it comes to version checks in
  3. openssh, this component does not matter, so ignore it.
  4. https://bugzilla.mindrot.org/show_bug.cgi?id=2212
  5. --- a/openbsd-compat/openssl-compat.c
  6. +++ b/openbsd-compat/openssl-compat.c
  7. @@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver)
  8. * For versions >= 1.0.0, major,minor,status must match and library
  9. * fix version must be equal to or newer than the header.
  10. */
  11. - mask = 0xfff0000fL; /* major,minor,status */
  12. + mask = 0xfff00000L; /* major,minor,status */
  13. hfix = (headerver & 0x000ff000) >> 12;
  14. lfix = (libver & 0x000ff000) >> 12;
  15. if ( (headerver & mask) == (libver & mask) && lfix >= hfix)