Merge pull request #331 from tangem/IOS-5346_rename_header

IOS-5346 Rename secp256k1 header
tangem · Dec 8, 2023 · 57b2b20 · 57b2b20
2 parents 4399166 + 2f20128
commit 57b2b20
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_ecdh.h b/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_ecdh.h
@@ -1,7 +1,7 @@
 #ifndef SECP256K1_ECDH_H
 #define SECP256K1_ECDH_H
 
-#include "secp256k1.h"
+#include "secp256k1_tangem.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_extrakeys.h b/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_extrakeys.h
@@ -1,7 +1,7 @@
 #ifndef SECP256K1_EXTRAKEYS_H
 #define SECP256K1_EXTRAKEYS_H
 
-#include "secp256k1.h"
+#include "secp256k1_tangem.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_preallocated.h b/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_preallocated.h
@@ -1,7 +1,7 @@
 #ifndef SECP256K1_PREALLOCATED_H
 #define SECP256K1_PREALLOCATED_H
 
-#include "secp256k1.h"
+#include "secp256k1_tangem.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_recovery.h b/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_recovery.h
@@ -1,7 +1,7 @@
 #ifndef SECP256K1_RECOVERY_H
 #define SECP256K1_RECOVERY_H
 
-#include "secp256k1.h"
+#include "secp256k1_tangem.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_schnorrsig.h b/TangemSdk/TangemSdk/Crypto/secp256k1/include/secp256k1_schnorrsig.h
@@ -1,7 +1,7 @@
 #ifndef SECP256K1_SCHNORRSIG_H
 #define SECP256K1_SCHNORRSIG_H
 
-#include "secp256k1.h"
+#include "secp256k1_tangem.h"
 #include "secp256k1_extrakeys.h"
 
 #ifdef __cplusplus

diff --git a/...mSdk/Crypto/secp256k1/include/secp256k1.h → ...ypto/secp256k1/include/secp256k1_tangem.h b/...mSdk/Crypto/secp256k1/include/secp256k1.h → ...ypto/secp256k1/include/secp256k1_tangem.h
diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/src/modules/extrakeys/main_impl.h b/TangemSdk/TangemSdk/Crypto/secp256k1/src/modules/extrakeys/main_impl.h
@@ -7,7 +7,7 @@
 #ifndef SECP256K1_MODULE_EXTRAKEYS_MAIN_H
 #define SECP256K1_MODULE_EXTRAKEYS_MAIN_H
 
-#include "../../../include/secp256k1.h"
+#include "../../../include/secp256k1_tangem.h"
 #include "../../../include/secp256k1_extrakeys.h"
 #include "../../util.h"
 

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/src/modules/schnorrsig/main_impl.h b/TangemSdk/TangemSdk/Crypto/secp256k1/src/modules/schnorrsig/main_impl.h
@@ -7,7 +7,7 @@
 #ifndef SECP256K1_MODULE_SCHNORRSIG_MAIN_H
 #define SECP256K1_MODULE_SCHNORRSIG_MAIN_H
 
-#include "../../../include/secp256k1.h"
+#include "../../../include/secp256k1_tangem.h"
 #include "../../../include/secp256k1_schnorrsig.h"
 #include "../../hash.h"
 

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/src/precompute_ecmult.c b/TangemSdk/TangemSdk/Crypto/secp256k1/src/precompute_ecmult.c
@@ -7,7 +7,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#include "../include/secp256k1.h"
+#include "../include/secp256k1_tangem.h"
 
 #include "assumptions.h"
 #include "util.h"

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/src/precomputed_ecmult.c b/TangemSdk/TangemSdk/Crypto/secp256k1/src/precomputed_ecmult.c
@@ -2,7 +2,7 @@
 /* This file contains an array secp256k1_pre_g with odd multiples of the base point G and
  * an array secp256k1_pre_g_128 with odd multiples of 2^128*G for accelerating the computation of a*P + b*G.
  */
-#include "../include/secp256k1.h"
+#include "../include/secp256k1_tangem.h"
 #include "group.h"
 #include "ecmult.h"
 #include "precomputed_ecmult.h"

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/src/precomputed_ecmult_gen.c b/TangemSdk/TangemSdk/Crypto/secp256k1/src/precomputed_ecmult_gen.c
@@ -1,6 +1,6 @@
 /* This file was automatically generated by precompute_ecmult_gen. */
 /* See ecmult_gen_impl.h for details about the contents of this file. */
-#include "../include/secp256k1.h"
+#include "../include/secp256k1_tangem.h"
 #include "group.h"
 #include "ecmult_gen.h"
 #include "precomputed_ecmult_gen.h"

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/src/secp256k1.c b/TangemSdk/TangemSdk/Crypto/secp256k1/src/secp256k1.c
@@ -17,7 +17,7 @@
 
 #define SECP256K1_BUILD
 
-#include "../include/secp256k1.h"
+#include "../include/secp256k1_tangem.h"
 #include "../include/secp256k1_preallocated.h"
 
 #include "assumptions.h"

diff --git a/TangemSdk/TangemSdk/Crypto/secp256k1/src/util.h b/TangemSdk/TangemSdk/Crypto/secp256k1/src/util.h
@@ -7,7 +7,7 @@
 #ifndef SECP256K1_UTIL_H
 #define SECP256K1_UTIL_H
 
-#include "../include/secp256k1.h"
+#include "../include/secp256k1_tangem.h"
 
 #include <stdlib.h>
 #include <stdint.h>

diff --git a/TangemSdk/TangemSdk/module.modulemap b/TangemSdk/TangemSdk/module.modulemap
@@ -4,6 +4,6 @@ module TangemSdk_secp256k1 [system] {
   header "Crypto/secp256k1/include/secp256k1_preallocated.h"
   header "Crypto/secp256k1/include/secp256k1_schnorrsig.h"
   header "Crypto/secp256k1/include/secp256k1_extrakeys.h"
-  header "Crypto/secp256k1/include/secp256k1.h"
+  header "Crypto/secp256k1/include/secp256k1_tangem.h" //secp256k1.h leads to conflicts with another secp256k1 copies when installing locally
   export *
 }