Merge pull request #28 from zooko/master

NEWS.rst

@@ -1,4 +1,10 @@
-2012-03-13  Zooko Wilcox-O'Hearn  <zooko@zooko.com>
+2016-02-03  Zooko Wilcox  <zookog@gmail.com>
+
+	• release pycryptopp-0.7.1
+	• disable optimized assembly implementations by default (#85)
+	• tweaks to the benchmarking scripts
+
+2012-03-13  Zooko Wilcox-O'Hearn  <zooko@zooko.com>
 
 	• src/pycryptopp/_version.py: release pycryptopp-0.6.0
 	• add Ed25519 signatures (#75)

README.rst

@@ -12,7 +12,6 @@ algorithms. It lives at https://tahoe-lafs.org/trac/pycryptopp
 
 RECOMMENDED algorithms:
 
-• AES-CTR ; from the Crypto++ library ; see pycryptopp.cipher.aes
 • XSalsa20 ; from the Crypto++ library ; see pycryptopp.cipher.xsalsa20
 • Ed25519 ; from the supercop library ; see pycryptopp.publickey.ed25519
 
@@ -91,18 +90,20 @@ and will increase your understanding greatly.
 ACKNOWLEDGEMENTS
 ----------------
 
-Thanks to Wei Dai and the contributors to Crypto++, Andrew M. Kuchling for
-his "pycrypto" library which inspired this one, Brian Warner for help on
-Python packaging questions, python-Ed25519, inspiration, and a million other
-things besides, Greg Hazel and Samuel Neves for Windows porting and fixing
-bugs, and Daniel J. Bernstein for Ed25519.
+Thanks to Wei Dai, Jeffrey Walton, and the other contributors to
+Crypto++, Andrew M. Kuchling for his "pycrypto" library which inspired
+this one, Brian Warner for help on Python packaging questions,
+python-Ed25519, inspiration, and a million other things besides, Greg
+Hazel and Samuel Neves for Windows porting and fixing bugs, Daira
+Hopwood for helping maintain pycryptopp, and Daniel J. Bernstein for
+Ed25519.
 
 
-Zooko Wilcox-O'Hearn
+Zooko Wilcox
 
-Boulder, Colorado, USA
+Berlin, Germany
 
-2012-03-18
+2016-01-03
 
 
 .. _¹: https://github.com/warner/python-ed25519

setup.py

@@ -382,16 +382,16 @@ def setup_path(self):
     def run(self):
         self.setup_path()
         from pycryptopp.bench import bench_algs
-        bench_algs.bench(MAXTIME=1.0)
+        bench_algs.bench(MAXTIME=1.0) # Requires pyutil ≤ 1.9.7
 commands["bench"] = Bench
 
 def _setup(longdescription):
     setup(name=PKG,
           version=version,
           description='Python wrappers for a few algorithms from the Crypto++ library',
           long_description=longdescription,
-          author='Zooko Wilcox-O\'Hearn',
-          author_email='zooko@zooko.com',
+          author='Zooko Wilcox',
+          author_email='zookog@gmail.com',
           url='https://tahoe-lafs.org/trac/' + PKG,
           license='GNU GPL', # see README.rst for details -- there is also an alternative licence
           packages=["pycryptopp",