Attachment 2140 Details for Bug 1991 – Improved improved test

[patch] Improved improved test

relax-openssl.diff (text/plain), 1019 bytes, created by Damien Miller on 2012-03-30 11:28:27 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2012-03-30 11:28:27 AEDT

Size: 1019 bytes

patch

obsolete

>Index: entropy.c
>===================================================================
>RCS file: /var/cvs/openssh/entropy.c,v
>retrieving revision 1.62
>diff -u -r1.62 entropy.c
>--- entropy.c	5 May 2011 03:48:37 -0000	1.62
>+++ entropy.c	30 Mar 2012 00:27:58 -0000
>@@ -211,9 +211,14 @@
> #endif
> 	/*
> 	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
>-	 * We match major, minor, fix and status (not patch)
>+	 * 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.
> 	 */
>-	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
>+	u_long version_mask = SSLeay() >= 0x1000000f ?  ~0xffff0L : ~0xff0L;
>+	if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
>+	    (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
> 		fatal("OpenSSL version mismatch. Built against %lx, you "
> 		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
>

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1991: 2137 | 2139 | 2140