Ticket #9: pycryptopp-system.patch

pycryptopp/cipher/aesmodule.cpp

@@ -9 +9 @@
 #endif
 
 /* from Crypto++ */
-#include "modes.h"
-#include "aes.h"
+#include <cryptopp/modes.h>
+#include <cryptopp/aes.h>
 
 static char aes__doc__[] = "\
 aes counter mode cipher\

pycryptopp/hash/sha256module.cpp

@@ -9 +9 @@
 #endif
 
 /* from Crypto++ */
-#include "sha.h"
-#include "hex.h"
-#include "filters.h"
+#include <cryptopp/sha.h>
+#include <cryptopp/hex.h>
+#include <cryptopp/filters.h>
 
 static char sha256__doc__[] = "\
 sha256 hash function\

pycryptopp/publickey/ecdsamodule.cpp

@@ -15 +15 @@
 #endif
 
 /* from Crypto++ */
-#include "filters.h"
-#include "osrng.h"
-#include "eccrypto.h"
-#include "oids.h"
+#include <cryptopp/filters.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/eccrypto.h>
+#include <cryptopp/oids.h>
 
 USING_NAMESPACE(CryptoPP)
 

pycryptopp/publickey/rsamodule.cpp

@@ -12 +12 @@
 #endif
 
 /* from Crypto++ */
-#include "filters.h"
-#include "osrng.h"
-#include "pssr.h"
-#include "rsa.h"
+#include <cryptopp/filters.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/pssr.h>
+#include <cryptopp/rsa.h>
 
 USING_NAMESPACE(CryptoPP)
 

setup.py

@@ -6 +6 @@
 # Author: Zooko Wilcox-O'Hearn
 # See README.txt for licensing information.
 
-import os, platform, re, subprocess, sys
+import os, re, sys
 
 try:
     from ez_setup import use_setuptools
@@ -18 +18 @@
 
 from setuptools import Extension, find_packages, setup
 
-CRYPTOPPDIR=os.path.join('cryptopp', 'c5')
-
 extra_compile_args=[]
 extra_link_args=[]
 define_macros=[]
 undef_macros=[]
-libraries=[]
+libraries=['cryptopp']
 ext_modules=[]
-include_dirs=[CRYPTOPPDIR]
+include_dirs=['/usr/include/cryptopp']
 library_dirs=[]
 
-# Versions of GNU assembler older than 2.10 do not understand the kind of ASM that Crypto++ uses.
-sp = subprocess.Popen(['as', '-v'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
-sp.stdin.close()
-sp.wait()
-if re.search("GNU assembler version (0|1|2.0)", sp.stderr.read()):
-    define_macros.append(('CRYPTOPP_DISABLE_ASM', 1))
-
-if 'sunos' in platform.system().lower():
-    extra_compile_args.append('-Wa,--divide') # allow use of "/" operator
-
-cryptopp_src = [ os.path.join(CRYPTOPPDIR, x) for x in os.listdir(CRYPTOPPDIR) if x.endswith('.cpp') ]
 
 trove_classifiers=[
     "Environment :: Console",
@@ -78 +65 @@
         raise RuntimeError("if %s.py exists, it is required to be well-formed" % (VERSIONFILE,))
 
 ext_modules.append(
-    Extension('pycryptopp.publickey.rsa', cryptopp_src + ['pycryptopp/publickey/rsamodule.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
+    Extension('pycryptopp.publickey.rsa', ['pycryptopp/publickey/rsamodule.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
     )
 
 ext_modules.append(
-    Extension('pycryptopp.publickey.ecdsa', cryptopp_src + ['pycryptopp/publickey/ecdsamodule.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
+    Extension('pycryptopp.publickey.ecdsa', ['pycryptopp/publickey/ecdsamodule.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
     )
 
 ext_modules.append(
-    Extension('pycryptopp.hash.sha256', cryptopp_src + ['pycryptopp/hash/sha256module.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
+    Extension('pycryptopp.hash.sha256', ['pycryptopp/hash/sha256module.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
     )
 
 ext_modules.append(
-    Extension('pycryptopp.cipher.aes', cryptopp_src + ['pycryptopp/cipher/aesmodule.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
+    Extension('pycryptopp.cipher.aes', ['pycryptopp/cipher/aesmodule.cpp',], include_dirs=include_dirs, library_dirs=library_dirs, libraries=libraries, extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, define_macros=define_macros, undef_macros=undef_macros)
     )
 
 miscdeps=os.path.join(os.getcwd(), 'misc', 'dependencies')