summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2014-02-09 16:10:14 +0000
committerColin Watson <cjwatson@debian.org>2014-02-10 02:40:18 +0000
commitdb27c81d3de93a0df6cb0f01e9b8b6bf4bb17d06 (patch)
tree2d12e7e1ca46c3309b109aeeccadace7e7619679
parent0b9347201e50bd518c09babde3e7650c2b2e9228 (diff)
Disable OpenSSL version check
OpenSSL's SONAME is sufficient nowadays. Author: Colin Watson <cjwatson@debian.org> Bug-Debian: http://bugs.debian.org/93581 Bug-Debian: http://bugs.debian.org/664383 Forwarded: not-needed Last-Update: 2013-12-23 Patch-Name: no-openssl-version-check.patch
-rw-r--r--entropy.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/entropy.c b/entropy.c
index 2d483b391..2aee2d917 100644
--- a/entropy.c
+++ b/entropy.c
@@ -209,18 +209,6 @@ seed_rng(void)
209#ifndef OPENSSL_PRNG_ONLY 209#ifndef OPENSSL_PRNG_ONLY
210 unsigned char buf[RANDOM_SEED_SIZE]; 210 unsigned char buf[RANDOM_SEED_SIZE];
211#endif 211#endif
212 /*
213 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
214 * We match major, minor, fix and status (not patch) for <1.0.0.
215 * After that, we acceptable compatible fix versions (so we
216 * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
217 * within a patch series.
218 */
219 u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L;
220 if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
221 (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
222 fatal("OpenSSL version mismatch. Built against %lx, you "
223 "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
224 212
225#ifndef OPENSSL_PRNG_ONLY 213#ifndef OPENSSL_PRNG_ONLY
226 if (RAND_status() == 1) { 214 if (RAND_status() == 1) {