Merged from upstream (py3k support) and modified so that all unit tes…

…ts pass.

.gitignore

@@ -7,3 +7,13 @@
 *.py[co]
 .DS_Store
 MANIFEST
+
+# Autoconf
+/autom4te.cache
+/autoscan.log
+/config.h
+/config.log
+/config.status
+
+# Backup files
+*~

ACKS

@@ -14,17 +14,24 @@ Please let me know if your name isn't here and should be!
 
 
 Nevins Bartolomeo
+Thorsten E. Behrens
 Tim Berners-Lee
+Frédéric Bertolus
 Ian Bicking
 Joris Bontje
 Antoon Bosselaers
 Andrea Bottoni
+Jean-Paul Calderone
 Sergey Chernov
+Geremy Condra
+Jan Dittberner
 Andrew Eland
 Philippe Frycia
 Peter Gutmann
 Hirendra Hindocha
 Nikhil Jhingan
+Sebastian Kayser
+Ryan Kelly
 Andrew M. Kuchling
 Piers Lauder
 M.-A. Lemburg
@@ -36,11 +43,14 @@ Wallace Owen
 Colin Plumb
 Robey Pointer
 Lorenz Quack
+Sebastian Ramacher
 Jeethu Rao
 James P. Rutledge
 Matt Schreiner
 Peter Simmons
+Janne Snabb
 Tom St. Denis
+Anders Sundman
 Paul Swartz
 Kevin M. Turner
 Barry A. Warsaw

ChangeLog

@@ -1,3 +1,30 @@
+2.4
+===
+	* Python 3 support!  (Thorsten E. Behrens, Anders Sundman)
+	  PyCrypto now supports every version of Python from 2.1 through 3.2.
+
+	* Timing-attack countermeasures in _fastmath: When built against
+	  libgmp version 5 or later, we use mpz_powm_sec instead of mpz_powm.
+	  This should prevent the timing attack described by Geremy Condra at
+	  PyCon 2011:
+	  http://blip.tv/pycon-us-videos-2009-2010-2011/pycon-2011-through-the-side-channel-timing-and-implementation-attacks-in-python-4897955
+
+	* New hash modules (for Python >= 2.5 only): SHA224, SHA384, and
+	  SHA512 (Frédéric Bertolus)
+
+	* Improve the test command in setup.py, by allowing tests to be
+	  performed on a single sub-package or module only. (Legrandin)
+
+	* Fix double-decref of "counter" when Cipher object initialisation
+	  fails (Ryan Kelly)
+
+	* Apply patches from Debian's python-crypto 2.3-3 package (Jan
+	  Dittberner, Sebastian Ramacher):
+	 - fix-RSA-generate-exception.patch
+	 - epydoc-exclude-introspect.patch
+	 - no-usr-local.patch
+
+
 2.3
 ===
 	* Fix NameError when attempting to use deprecated getRandomNumber()

Doc/epydoc-config

@@ -15,5 +15,9 @@ link: <a href="http://www.pycrypto.org/">PyCrypto.org</a>
 
 # The documentation is usually built on a Linux machine; nt.py tries to
 # import the winrandom module.
+<<<<<<< HEAD
 exclude-introspect: ^Crypto\.Util\.osentropy\.nt$
 exclude: ^Crypto\.SelfTest
+=======
+exclude-introspect: ^Crypto\.Random\.OSRNG\.nt|Crypto\.Util\.winrandom$
+>>>>>>> b9658a26003ebfcfce1804a2363a29354799b47e