Attachment 2139 Details for Bug 1991 – Improved test

[patch] Improved test

relax-openssl.diff (text/plain), 1.18 KB, created by Damien Miller on 2012-03-30 11:18:19 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2012-03-30 11:18:19 AEDT

Size: 1.18 KB

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:15:25 -0000
>@@ -211,9 +211,18 @@
> #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 patch versions (so we
>+	 * allow 1.0.1 to work with 1.0.0).
> 	 */
>-	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
>+	u_long bldver = OPENSSL_VERSION_NUMBER & ~0xff0L;
>+	u_long runver = SSLeay() & ~0xff0L;
>+	if (bldver != runver &&
>+	    !(((bldver >> 12) >= 0x10000) &&	/* Allow >=1.* IFF */
>+	    (bldver >> 20) == (runver >> 20) &&	/* minors match; and */
>+	    (bldver >> 12) <= (runver >> 12) &&	/* runtime is not older; and */
>+	    (bldver & 0xf) == 0xf &&		/* build is release; and */
>+	    (runver & 0xf) == 0xf))		/* runtime is release */
> 		fatal("OpenSSL version mismatch. Built against %lx, you "
> 		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
>

Actions: View | Diff

Attachments on bug 1991: 2137 | 2139 | 2140