33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
# disable run-time check for OpenSSL ABI by version number as that is not a
|
||
|
|
# reliable indicator of ABI changes and doesn't make much sense in a
|
||
|
|
# distribution package
|
||
|
|
|
||
|
|
diff --git a/openssh-6.2p2/entropy.c b/openssh-6.2p2/entropy.c
|
||
|
|
--- a/openssh-6.2p2/entropy.c
|
||
|
|
+++ b/openssh-6.2p2/entropy.c
|
||
|
|
@@ -212,22 +212,23 @@ seed_rng(void)
|
||
|
|
#endif
|
||
|
|
/*
|
||
|
|
* OpenSSL version numbers: MNNFFPPS: major minor fix patch status
|
||
|
|
* 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 0
|
||
|
|
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());
|
||
|
|
-
|
||
|
|
+#endif
|
||
|
|
#ifndef OPENSSL_PRNG_ONLY
|
||
|
|
if (RAND_status() == 1) {
|
||
|
|
debug3("RNG is ready, skipping seeding");
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (seed_from_prngd(buf, sizeof(buf)) == -1)
|
||
|
|
fatal("Could not obtain seed from PRNGd");
|