status-im
/
secp256k1
mirror of https://github.com/status-im/secp256k1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #925: changed include statements without prefix 'include/' 

3c90bdda95 change local lib headers to be relative for those pointing at "include/" dir (William Bright)

Pull request description:

  Referencing #924 , this PR splits the two issues brought on to a smaller to digest change. What this does is removes the prefix "include/" when referencing the local library header files.

  e.g:
  from:
  ```cpp
  #include "include/secp256k1.h"
  ```
  to:
  ```cpp
  #include "secp256k1.h"
  ```

  Rationale besides styling and consistency across other files in the repo, it makes it easier for outside builds to properly locate the headers.

  A live example seen here when attempting to build this library within bitcoin repo:
  ```sh
  [ 14%] Building CXX object leveldb/CMakeFiles/leveldb.dir/util/bloom.cc.o
  /tmp/bitcoin/src/secp256k1/src/secp256k1.c:7:10: fatal error: include/secp256k1.h: No such file or directory
      7 | #include "include/secp256k1.h"
        |          ^~~~~~~~~~~~~~~~~~~~~
  compilation terminated.
  make[2]: *** [secp256k1/CMakeFiles/Secp256k1.dir/build.make:76: secp256k1/CMakeFiles/Secp256k1.dir/src/secp256k1.c.o] Error 1
  make[1]: *** [CMakeFiles/Makefile2:537: secp256k1/CMakeFiles/Secp256k1.dir/all] Error 2
  make[1]: *** Waiting for unfinished jobs....

  ```

ACKs for top commit:
  gmaxwell:
    ACK 3c90bdda95
  real-or-random:
    ACK 3c90bdda95 code looks good and even the tests compile fine now without `-I` args

Tree-SHA512: 94d212718c6f4901f1c310aff504b7afedda91268143ffe1b45e9883cd517c0599e40ac798a51b54d66cd31646fe8cb1a489f1776612cfb5963654f4a1cee757
This commit is contained in:
Tim Ruffing 2021-05-05 20:14:39 +02:00
parent d0bd2693e3 3c90bdda95
commit 185a6af227
No known key found for this signature in database
GPG Key ID: 8C461CCD293F6011
25 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/lax_der_parsing.c
View File

@ -5,7 +5,6 @@
***********************************************************************/ ***********************************************************************/
#include <string.h> #include <string.h>
#include <secp256k1.h>
#include "lax_der_parsing.h" #include "lax_der_parsing.h"

2
contrib/lax_der_parsing.h
View File

@ -51,7 +51,9 @@
#ifndef SECP256K1_CONTRIB_LAX_DER_PARSING_H #ifndef SECP256K1_CONTRIB_LAX_DER_PARSING_H
#define SECP256K1_CONTRIB_LAX_DER_PARSING_H #define SECP256K1_CONTRIB_LAX_DER_PARSING_H
#ifndef SECP256K1_H
#include <secp256k1.h> #include <secp256k1.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
contrib/lax_der_privatekey_parsing.c
View File

@ -5,7 +5,6 @@
***********************************************************************/ ***********************************************************************/
#include <string.h> #include <string.h>
#include <secp256k1.h>
#include "lax_der_privatekey_parsing.h" #include "lax_der_privatekey_parsing.h"

2
contrib/lax_der_privatekey_parsing.h
View File

@ -28,7 +28,9 @@
#ifndef SECP256K1_CONTRIB_BER_PRIVATEKEY_H #ifndef SECP256K1_CONTRIB_BER_PRIVATEKEY_H
#define SECP256K1_CONTRIB_BER_PRIVATEKEY_H #define SECP256K1_CONTRIB_BER_PRIVATEKEY_H
#ifndef SECP256K1_H
#include <secp256k1.h> #include <secp256k1.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
src/bench_ecdh.c
View File

@ -6,8 +6,8 @@
#include <string.h> #include <string.h>
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "include/secp256k1_ecdh.h" #include "../include/secp256k1_ecdh.h"
#include "util.h" #include "util.h"
#include "bench.h" #include "bench.h"

2
src/bench_ecmult.c
View File

@ -6,8 +6,8 @@
#include <stdio.h> #include <stdio.h>
#include "secp256k1.c" #include "secp256k1.c"
#include "../include/secp256k1.h"
#include "include/secp256k1.h"
#include "util.h" #include "util.h"
#include "hash_impl.h" #include "hash_impl.h"
#include "field_impl.h" #include "field_impl.h"

2
src/bench_internal.c
View File

@ -6,8 +6,8 @@
#include <stdio.h> #include <stdio.h>
#include "secp256k1.c" #include "secp256k1.c"
#include "../include/secp256k1.h"
#include "include/secp256k1.h"
#include "assumptions.h" #include "assumptions.h"
#include "util.h" #include "util.h"
#include "hash_impl.h" #include "hash_impl.h"

4
src/bench_recover.c
View File

@ -4,8 +4,8 @@
* file COPYING or https://www.opensource.org/licenses/mit-license.php.* * file COPYING or https://www.opensource.org/licenses/mit-license.php.*
***********************************************************************/ ***********************************************************************/
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "include/secp256k1_recovery.h" #include "../include/secp256k1_recovery.h"
#include "util.h" #include "util.h"
#include "bench.h" #include "bench.h"

4
src/bench_schnorrsig.c
View File

@ -8,8 +8,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "include/secp256k1_schnorrsig.h" #include "../include/secp256k1_schnorrsig.h"
#include "util.h" #include "util.h"
#include "bench.h" #include "bench.h"

2
src/bench_sign.c
View File

@ -4,7 +4,7 @@
* file COPYING or https://www.opensource.org/licenses/mit-license.php.* * file COPYING or https://www.opensource.org/licenses/mit-license.php.*
***********************************************************************/ ***********************************************************************/
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "util.h" #include "util.h"
#include "bench.h" #include "bench.h"

2
src/bench_verify.c
View File

@ -7,7 +7,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "util.h" #include "util.h"
#include "bench.h" #include "bench.h"

2
src/gen_context.c
View File

@ -18,7 +18,7 @@
need to build the external ASM for the build and the host machine. */ need to build the external ASM for the build and the host machine. */
#undef USE_EXTERNAL_ASM #undef USE_EXTERNAL_ASM
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "assumptions.h" #include "assumptions.h"
#include "util.h" #include "util.h"
#include "field_impl.h" #include "field_impl.h"

4
src/modules/ecdh/main_impl.h
View File

@ -7,8 +7,8 @@
#ifndef SECP256K1_MODULE_ECDH_MAIN_H #ifndef SECP256K1_MODULE_ECDH_MAIN_H
#define SECP256K1_MODULE_ECDH_MAIN_H #define SECP256K1_MODULE_ECDH_MAIN_H
#include "include/secp256k1_ecdh.h" #include "../../../include/secp256k1_ecdh.h"
#include "ecmult_const_impl.h" #include "../../ecmult_const_impl.h"
static int ecdh_hash_function_sha256(unsigned char *output, const unsigned char *x32, const unsigned char *y32, void *data) { static int ecdh_hash_function_sha256(unsigned char *output, const unsigned char *x32, const unsigned char *y32, void *data) {
unsigned char version = (y32[31] & 0x01) | 0x02; unsigned char version = (y32[31] & 0x01) | 0x02;

4
src/modules/extrakeys/main_impl.h
View File

@ -7,8 +7,8 @@
#ifndef SECP256K1_MODULE_EXTRAKEYS_MAIN_H #ifndef SECP256K1_MODULE_EXTRAKEYS_MAIN_H
#define SECP256K1_MODULE_EXTRAKEYS_MAIN_H #define SECP256K1_MODULE_EXTRAKEYS_MAIN_H
#include "include/secp256k1.h" #include "../../../include/secp256k1.h"
#include "include/secp256k1_extrakeys.h" #include "../../../include/secp256k1_extrakeys.h"
static SECP256K1_INLINE int secp256k1_xonly_pubkey_load(const secp256k1_context* ctx, secp256k1_ge *ge, const secp256k1_xonly_pubkey *pubkey) { static SECP256K1_INLINE int secp256k1_xonly_pubkey_load(const secp256k1_context* ctx, secp256k1_ge *ge, const secp256k1_xonly_pubkey *pubkey) {
return secp256k1_pubkey_load(ctx, ge, (const secp256k1_pubkey *) pubkey); return secp256k1_pubkey_load(ctx, ge, (const secp256k1_pubkey *) pubkey);

2
src/modules/extrakeys/tests_exhaustive_impl.h
View File

@ -8,7 +8,7 @@
#define SECP256K1_MODULE_EXTRAKEYS_TESTS_EXHAUSTIVE_H #define SECP256K1_MODULE_EXTRAKEYS_TESTS_EXHAUSTIVE_H
#include "src/modules/extrakeys/main_impl.h" #include "src/modules/extrakeys/main_impl.h"
#include "include/secp256k1_extrakeys.h" #include "../../../include/secp256k1_extrakeys.h"
static void test_exhaustive_extrakeys(const secp256k1_context *ctx, const secp256k1_ge* group) { static void test_exhaustive_extrakeys(const secp256k1_context *ctx, const secp256k1_ge* group) {
secp256k1_keypair keypair[EXHAUSTIVE_TEST_ORDER - 1]; secp256k1_keypair keypair[EXHAUSTIVE_TEST_ORDER - 1];

2
src/modules/extrakeys/tests_impl.h
View File

@ -7,7 +7,7 @@
#ifndef SECP256K1_MODULE_EXTRAKEYS_TESTS_H #ifndef SECP256K1_MODULE_EXTRAKEYS_TESTS_H
#define SECP256K1_MODULE_EXTRAKEYS_TESTS_H #define SECP256K1_MODULE_EXTRAKEYS_TESTS_H
#include "secp256k1_extrakeys.h" #include "../../../include/secp256k1_extrakeys.h"
static secp256k1_context* api_test_context(int flags, int *ecount) { static secp256k1_context* api_test_context(int flags, int *ecount) {
secp256k1_context *ctx0 = secp256k1_context_create(flags); secp256k1_context *ctx0 = secp256k1_context_create(flags);

2
src/modules/recovery/main_impl.h
View File

@ -7,7 +7,7 @@
#ifndef SECP256K1_MODULE_RECOVERY_MAIN_H #ifndef SECP256K1_MODULE_RECOVERY_MAIN_H
#define SECP256K1_MODULE_RECOVERY_MAIN_H #define SECP256K1_MODULE_RECOVERY_MAIN_H
#include "include/secp256k1_recovery.h" #include "../../../include/secp256k1_recovery.h"
static void secp256k1_ecdsa_recoverable_signature_load(const secp256k1_context* ctx, secp256k1_scalar* r, secp256k1_scalar* s, int* recid, const secp256k1_ecdsa_recoverable_signature* sig) { static void secp256k1_ecdsa_recoverable_signature_load(const secp256k1_context* ctx, secp256k1_scalar* r, secp256k1_scalar* s, int* recid, const secp256k1_ecdsa_recoverable_signature* sig) {
(void)ctx; (void)ctx;

2
src/modules/recovery/tests_exhaustive_impl.h
View File

@ -8,7 +8,7 @@
#define SECP256K1_MODULE_RECOVERY_EXHAUSTIVE_TESTS_H #define SECP256K1_MODULE_RECOVERY_EXHAUSTIVE_TESTS_H
#include "src/modules/recovery/main_impl.h" #include "src/modules/recovery/main_impl.h"
#include "include/secp256k1_recovery.h" #include "../../../include/secp256k1_recovery.h"
void test_exhaustive_recovery_sign(const secp256k1_context *ctx, const secp256k1_ge *group) { void test_exhaustive_recovery_sign(const secp256k1_context *ctx, const secp256k1_ge *group) {
int i, j, k; int i, j, k;

6
src/modules/schnorrsig/main_impl.h
View File

@ -7,9 +7,9 @@
#ifndef SECP256K1_MODULE_SCHNORRSIG_MAIN_H #ifndef SECP256K1_MODULE_SCHNORRSIG_MAIN_H
#define SECP256K1_MODULE_SCHNORRSIG_MAIN_H #define SECP256K1_MODULE_SCHNORRSIG_MAIN_H
#include "include/secp256k1.h" #include "../../../include/secp256k1.h"
#include "include/secp256k1_schnorrsig.h" #include "../../../include/secp256k1_schnorrsig.h"
#include "hash.h" #include "../../hash.h"
/* Initializes SHA256 with fixed midstate. This midstate was computed by applying /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
* SHA256 to SHA256("BIP0340/nonce")||SHA256("BIP0340/nonce"). */ * SHA256 to SHA256("BIP0340/nonce")||SHA256("BIP0340/nonce"). */

2
src/modules/schnorrsig/tests_exhaustive_impl.h
View File

@ -7,7 +7,7 @@
#ifndef SECP256K1_MODULE_SCHNORRSIG_TESTS_EXHAUSTIVE_H #ifndef SECP256K1_MODULE_SCHNORRSIG_TESTS_EXHAUSTIVE_H
#define SECP256K1_MODULE_SCHNORRSIG_TESTS_EXHAUSTIVE_H #define SECP256K1_MODULE_SCHNORRSIG_TESTS_EXHAUSTIVE_H
#include "include/secp256k1_schnorrsig.h" #include "../../../include/secp256k1_schnorrsig.h"
#include "src/modules/schnorrsig/main_impl.h" #include "src/modules/schnorrsig/main_impl.h"
static const unsigned char invalid_pubkey_bytes[][32] = { static const unsigned char invalid_pubkey_bytes[][32] = {

2
src/modules/schnorrsig/tests_impl.h
View File

@ -7,7 +7,7 @@
#ifndef SECP256K1_MODULE_SCHNORRSIG_TESTS_H #ifndef SECP256K1_MODULE_SCHNORRSIG_TESTS_H
#define SECP256K1_MODULE_SCHNORRSIG_TESTS_H #define SECP256K1_MODULE_SCHNORRSIG_TESTS_H
#include "secp256k1_schnorrsig.h" #include "../../../include/secp256k1_schnorrsig.h"
/* Checks that a bit flip in the n_flip-th argument (that has n_bytes many /* Checks that a bit flip in the n_flip-th argument (that has n_bytes many
* bytes) changes the hash function * bytes) changes the hash function

4
src/secp256k1.c
View File

@ -6,8 +6,8 @@
#define SECP256K1_BUILD #define SECP256K1_BUILD
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "include/secp256k1_preallocated.h" #include "../include/secp256k1_preallocated.h"
#include "assumptions.h" #include "assumptions.h"
#include "util.h" #include "util.h"

8
src/tests.c
View File

@ -15,8 +15,8 @@
#include <time.h> #include <time.h>
#include "secp256k1.c" #include "secp256k1.c"
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "include/secp256k1_preallocated.h" #include "../include/secp256k1_preallocated.h"
#include "testrand_impl.h" #include "testrand_impl.h"
#include "util.h" #include "util.h"
@ -30,8 +30,8 @@ void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
# endif # endif
#endif #endif
#include "contrib/lax_der_parsing.c" #include "../contrib/lax_der_parsing.c"
#include "contrib/lax_der_privatekey_parsing.c" #include "../contrib/lax_der_privatekey_parsing.c"
#include "modinv32_impl.h" #include "modinv32_impl.h"
#ifdef SECP256K1_WIDEMUL_INT128 #ifdef SECP256K1_WIDEMUL_INT128

3
src/tests_exhaustive.c
View File

@ -10,7 +10,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#undef USE_ECMULT_STATIC_PRECOMPUTATION #undef USE_ECMULT_STATIC_PRECOMPUTATION
@ -21,7 +20,7 @@
#endif #endif
#include "secp256k1.c" #include "secp256k1.c"
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "assumptions.h" #include "assumptions.h"
#include "group.h" #include "group.h"
#include "testrand_impl.h" #include "testrand_impl.h"

10
src/valgrind_ctime_test.c
View File

@ -7,24 +7,24 @@
#include <valgrind/memcheck.h> #include <valgrind/memcheck.h>
#include <stdio.h> #include <stdio.h>
#include "include/secp256k1.h" #include "../include/secp256k1.h"
#include "assumptions.h" #include "assumptions.h"
#include "util.h" #include "util.h"
#ifdef ENABLE_MODULE_ECDH #ifdef ENABLE_MODULE_ECDH
# include "include/secp256k1_ecdh.h" # include "../include/secp256k1_ecdh.h"
#endif #endif
#ifdef ENABLE_MODULE_RECOVERY #ifdef ENABLE_MODULE_RECOVERY
# include "include/secp256k1_recovery.h" # include "../include/secp256k1_recovery.h"
#endif #endif
#ifdef ENABLE_MODULE_EXTRAKEYS #ifdef ENABLE_MODULE_EXTRAKEYS
# include "include/secp256k1_extrakeys.h" # include "../include/secp256k1_extrakeys.h"
#endif #endif
#ifdef ENABLE_MODULE_SCHNORRSIG #ifdef ENABLE_MODULE_SCHNORRSIG
#include "include/secp256k1_schnorrsig.h" #include "../include/secp256k1_schnorrsig.h"
#endif #endif
void run_tests(secp256k1_context *ctx, unsigned char *key); void run_tests(secp256k1_context *ctx, unsigned char *key);