Blame pycrypto-2.6.1-unbundle-libtomcrypt.patch
|
 |
88a061a |
--- setup.py
|
|
|
88a061a |
+++ setup.py
|
|
|
88a061a |
@@ -390,10 +390,12 @@ kw = {'name':"pycrypto",
|
|
|
88a061a |
include_dirs=['src/'],
|
|
|
88a061a |
sources=["src/CAST.c"]),
|
|
|
88a061a |
Extension("Crypto.Cipher._DES",
|
|
|
88a061a |
- include_dirs=['src/', 'src/libtom/'],
|
|
|
88a061a |
+ include_dirs=['src/'],
|
|
|
88a061a |
+ libraries=['tomcrypt'],
|
|
|
88a061a |
sources=["src/DES.c"]),
|
|
|
88a061a |
Extension("Crypto.Cipher._DES3",
|
|
|
88a061a |
- include_dirs=['src/', 'src/libtom/'],
|
|
|
88a061a |
+ include_dirs=['src/'],
|
|
|
88a061a |
+ libraries=['tomcrypt'],
|
|
|
88a061a |
sources=["src/DES3.c"]),
|
|
|
88a061a |
|
|
|
88a061a |
# Stream ciphers
|
|
|
88a061a |
--- src/DES.c
|
|
|
88a061a |
+++ src/DES.c
|
|
|
88a061a |
@@ -28,8 +28,8 @@
|
|
|
88a061a |
* assert-like LTC_ARGCHK macro fails. */
|
|
|
88a061a |
#define ARGTYPE 4
|
|
|
88a061a |
|
|
|
88a061a |
-/* Include the actial DES implementation */
|
|
|
88a061a |
-#include "libtom/tomcrypt_des.c"
|
|
|
88a061a |
+/* Access the actual DES implementation */
|
|
|
88a061a |
+#include "tomcrypt.h"
|
|
|
88a061a |
|
|
|
88a061a |
#undef DES /* this is needed because tomcrypt_custom.h defines DES to an empty string */
|
|
|
88a061a |
|