embed/extmod: use full paths to solve secp256k1.h filename collision

trezor · Mar 20, 2019 · 5e42337 · 5e42337
1 parent e2dadb3
commit 5e42337
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/SConscript.firmware b/SConscript.firmware
@@ -88,7 +88,7 @@ SOURCE_MOD += [
 
 # libsecp256k1-zkp
 CPPPATH_MOD += [
-    'vendor/secp256k1-zkp/',
+    'vendor/secp256k1-zkp',
     'vendor/secp256k1-zkp/src',
     'vendor/secp256k1-zkp/include',
 ]

diff --git a/embed/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
@@ -19,8 +19,8 @@
 
 #include "py/objstr.h"
 
-#include "ecdsa.h"
-#include "secp256k1.h"
+#include "vendor/trezor-crypto/ecdsa.h"
+#include "vendor/trezor-crypto/secp256k1.h"
 
 /// package: trezorcrypto.secp256k1
 

diff --git a/embed/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1_zkp.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1_zkp.h
@@ -19,11 +19,10 @@
 
 #include "py/objstr.h"
 
-#include "ecdsa.h"
-#include "secp256k1.h"
-#include "secp256k1_ecdh.h"
-#include "secp256k1_preallocated.h"
-#include "secp256k1_recovery.h"
+#include "vendor/secp256k1-zkp/include/secp256k1.h"
+#include "vendor/secp256k1-zkp/include/secp256k1_ecdh.h"
+#include "vendor/secp256k1-zkp/include/secp256k1_preallocated.h"
+#include "vendor/secp256k1-zkp/include/secp256k1_recovery.h"
 
 // The minimum buffer size can vary in future secp256k1-zkp revisions.
 // It can always be determined by a call to