From: Brian Warner <warner@lothar.com>
Date: Wed, 14 Mar 2012 01:09:14 +0000 (-0700)
Subject: bump pycryptopp dependency to >=0.6.0, to get ed25519 signatures
X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/-?a=commitdiff_plain;h=0e60920bafb39a695c0b27a7c671890685a93d7b;p=tahoe-lafs%2Ftahoe-lafs.git

bump pycryptopp dependency to >=0.6.0, to get ed25519 signatures

This is for the upcoming #466 signed-introducer code.
---

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 5bb2b13a..6f7d7cf5 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -76,18 +76,8 @@ package_imports = [
 
 def require_more():
     import platform, sys
-
-    if platform.machine().lower() in ['i386', 'x86', 'i686', 'x86_64', 'amd64', '']:
-        # pycryptopp v0.5.20 fixes bugs in SHA-256 and AES on x86 or amd64
-        # (from Crypto++ revisions 470, 471, 480, 492).  The '' is there
-        # in case platform.machine is broken and this is actually an x86
-        # or amd64 machine.
-        install_requires.append("pycryptopp >= 0.5.20")
-    else:
-        # pycryptopp v0.5.13 had a new bundled version of Crypto++
-        # (v5.6.0) and a new bundled version of setuptools (although that
-        # shouldn't make any difference to users of pycryptopp).
-        install_requires.append("pycryptopp >= 0.5.14")
+    # pycryptopp-0.6.0 includes ed25519
+    install_requires.append("pycryptopp >= 0.6.0")
 
     # Sqlite comes built into Python >= 2.5, and is provided by the "pysqlite"
     # distribution for Python 2.4.