summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/no-openssl-version-check.patch32
-rw-r--r--debian/patches/series1
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/no-openssl-version-check.patch b/debian/patches/no-openssl-version-check.patch
new file mode 100644
index 000000000..8c7b6538e
--- /dev/null
+++ b/debian/patches/no-openssl-version-check.patch
@@ -0,0 +1,32 @@
1Description: Disable OpenSSL version check
2 OpenSSL's SONAME is sufficient nowadays.
3Author: Philip Hands <phil@hands.com>
4Author: Colin Watson <cjwatson@debian.org>
5Bug-Debian: http://bugs.debian.org/93581
6Bug-Debian: http://bugs.debian.org/664383
7Forwarded: not-needed
8Last-Update: 2013-12-23
9
10Index: b/entropy.c
11===================================================================
12--- a/entropy.c
13+++ b/entropy.c
14@@ -209,18 +209,6 @@
15 #ifndef OPENSSL_PRNG_ONLY
16 unsigned char buf[RANDOM_SEED_SIZE];
17 #endif
18- /*
19- * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
20- * We match major, minor, fix and status (not patch) for <1.0.0.
21- * After that, we acceptable compatible fix versions (so we
22- * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
23- * within a patch series.
24- */
25- u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L;
26- if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
27- (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
28- fatal("OpenSSL version mismatch. Built against %lx, you "
29- "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
30
31 #ifndef OPENSSL_PRNG_ONLY
32 if (RAND_status() == 1) {
diff --git a/debian/patches/series b/debian/patches/series
index f5c2ebb52..4d2080a37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,6 +43,7 @@ doc-upstart.patch
43ssh-agent-setgid.patch 43ssh-agent-setgid.patch
44 44
45# Debian-specific configuration 45# Debian-specific configuration
46no-openssl-version-check.patch
46gnome-ssh-askpass2-icon.patch 47gnome-ssh-askpass2-icon.patch
47sigstop.patch 48sigstop.patch
48debian-config.patch 49debian-config.patch