Bugzilla – Attachment 2137 Details for
Bug 1991
openssl version checking needs updating
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
update openssl ver check
openssh-openssl-1.0.x.patch (text/plain), 834 bytes, created by
Mike Frysinger
on 2012-03-15 15:05:05 AEDT
(
hide
)
Description:
update openssl ver check
Filename:
MIME Type:
Creator:
Mike Frysinger
Created:
2012-03-15 15:05:05 AEDT
Size:
834 bytes
patch
obsolete
>diff --git a/entropy.c b/entropy.c >index 2d6d3ec..0b20f9e 100644 >--- a/entropy.c >+++ b/entropy.c >@@ -211,9 +211,14 @@ seed_rng(void) > #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 minor 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 >> 12) < 0x10000 && bldver != runver) || >+ (bldver >> 12) >= 0x10000 && (runver >> 12) < (bldver >> 12))) > fatal("OpenSSL version mismatch. Built against %lx, you " > "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=2137">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1991
:
2137
|
2139
|
2140