You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.6 KiB
46 lines
1.6 KiB
5 years ago
|
diff -up ./setup.py.bak ./setup.py
|
||
|
|
--- ./setup.py.bak 2019-01-19 22:52:55.000000000 +0100
|
||
|
|
+++ ./setup.py 2019-02-15 15:29:46.960976879 +0100
|
||
|
|
@@ -367,11 +367,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']),
|
||
|
|
@@ -400,8 +402,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.bak ./src/DES.c
|
||
|
|
--- ./src/DES.c.bak 2019-01-19 22:52:55.000000000 +0100
|
||
|
|
+++ ./src/DES.c 2019-02-15 15:30:27.014967034 +0100
|
||
|
|
@@ -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;
|