]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Be more generous to backports of Heartbleed fix to 1.0.1 through 1.0.1c.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 22 Apr 2014 14:47:10 +0000 (15:47 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Mon, 1 Jun 2015 13:52:11 +0000 (14:52 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/util/check_pyopenssl.py

index 46c1d06dca7cf7caeab8f8c8bc57a9f0fa5f8fef..ebf2e12350342f10a7756c4297a4968a90a1960a 100644 (file)
@@ -50,11 +50,15 @@ def check_openssl_version(SSL):
                 if '-DOPENSSL_NO_HEARTBEATS' in openssl_cflags.split(' '):
                     return
 
-                # Also allow these versions if a vulnerability test passes (we do this only if
-                # the version and compiler flag checks are inconclusive, to minimize the chance
-                # for the test to break or give the wrong result somehow).
-                if not is_vulnerable(SSL):
-                    return
+        if numeric_components == [1, 0, 1]:
+            # Also allow versions 1.0.1 through 1.0.1f if a Heartbleed vulnerability test passes.
+            # We assume that a library patched for Heartbleed is also patched for previous
+            # security bugs that affected 1.0.1 through 1.0.1c.
+            #
+            # We do this check only if the version and compiler flag checks are inconclusive, to
+            # minimize the chance for the test to break or give the wrong result somehow.
+            if not is_vulnerable(SSL):
+                return
 
     raise OpenSSLVersionError("refusing to use %s which may be vulnerable to security bugs.\n"
                               "Please upgrade to OpenSSL 1.0.1g or later." % (openssl_version,))