summaryrefslogtreecommitdiff
path: root/entropy.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-31 11:19:33 +0100
committerColin Watson <cjwatson@debian.org>2010-03-31 11:19:33 +0100
commit69456e98a770b7e946b416e5a41ec6288a31e22f (patch)
tree66ae4e885a5e76e8c67552b2f6d1336bcacf96fd /entropy.c
parent131538f5a7aac4befda4191571235f2b444b59e3 (diff)
Drop Debian-specific removal of OpenSSL version check. Upstream ignores
the two patchlevel nybbles now, which is sufficient to address the original reason this change was introduced, and it appears that any change in the major/minor/fix nybbles would involve a new libssl package name. (We'd still lose if the status nybble were ever changed, but that would mean somebody had packaged a development/beta version rather than a proper release, which doesn't appear to be normal practice.)
Diffstat (limited to 'entropy.c')
-rw-r--r--entropy.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/entropy.c b/entropy.c
index 3f63239f4..8b705397f 100644
--- a/entropy.c
+++ b/entropy.c
@@ -151,8 +151,6 @@ seed_rng(void)
151void 151void
152init_rng(void) 152init_rng(void)
153{ 153{
154#if defined (DISABLED_BY_DEBIAN)
155 /* drow: Is this check still too strict for Debian? */
156 /* 154 /*
157 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status 155 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
158 * We match major, minor, fix and status (not patch) 156 * We match major, minor, fix and status (not patch)
@@ -160,7 +158,6 @@ init_rng(void)
160 if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) 158 if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
161 fatal("OpenSSL version mismatch. Built against %lx, you " 159 fatal("OpenSSL version mismatch. Built against %lx, you "
162 "have %lx", OPENSSL_VERSION_NUMBER, SSLeay()); 160 "have %lx", OPENSSL_VERSION_NUMBER, SSLeay());
163#endif
164 161
165#ifndef OPENSSL_PRNG_ONLY 162#ifndef OPENSSL_PRNG_ONLY
166 original_uid = getuid(); 163 original_uid = getuid();