Blob Blame History Raw
diff -up ./setup.py.old ./setup.py
--- ./setup.py.old	2018-06-18 23:01:44.000000000 +0200
+++ ./setup.py	2018-06-19 14:48:16.525150988 +0200
@@ -203,9 +203,6 @@ class PCTBuildExt (build_ext):
         return []
 
     def build_extensions(self):
-        # Disable any assembly in libtomcrypt files
-        self.compiler.define_macro("LTC_NO_ASM")
-
         # Detect which modules should be compiled
         self.detect_modules()
 
@@ -603,11 +600,13 @@ ext_modules = [
         include_dirs=['src/'],
         sources=["src/CAST.c"]),
     Extension("Crypto.Cipher._raw_des",
-        include_dirs=['src/', 'src/libtom/'],
-        sources=["src/DES.c"]),
+        include_dirs=['src/'],
+        sources=["src/DES.c"],
+        extra_link_args=['-ltomcrypt']),
     Extension("Crypto.Cipher._raw_des3",
-        include_dirs=['src/', 'src/libtom/'],
-        sources=["src/DES3.c"]),
+        include_dirs=['src/'],
+        sources=["src/DES3.c"],
+        extra_link_args=['-ltomcrypt']),
     Extension("Crypto.Util._cpuid_c",
         include_dirs=['src/'],
         sources=['src/cpuid.c']),
@@ -637,8 +636,9 @@ ext_modules = [
         include_dirs=['src/'],
         sources=["src/ARC4.c"]),
     Extension("Crypto.Cipher._Salsa20",
-        include_dirs=['src/', 'src/libtom/'],
-        sources=["src/Salsa20.c"]),
+        include_dirs=['src/'],
+        sources=["src/Salsa20.c"],
+        extra_link_args=['-ltomcrypt']),
     Extension("Crypto.Cipher._chacha20",
         include_dirs=['src/'],
         sources=["src/chacha20.c"]),
diff -up ./src/DES.c.old ./src/DES.c
--- ./src/DES.c.old	2018-06-18 23:01:44.000000000 +0200
+++ ./src/DES.c	2018-06-19 14:48:16.525150988 +0200
@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
 
 /* Include the actial DES implementation */
 #define LTC_NO_PROTOTYPES
-#include "libtom/tomcrypt_des.c"
+#include <tomcrypt.h>
 
 struct block_state {
     symmetric_key sk;