bump to v0.3.1 (#45)
* simplify build system thanks to upstream changes
* add secp version to library version, bump to 0.6
* bump upstream to 0.3.1 ([`git diff
6138d73be471ece4717af8e7f419dde0a414568e..346a053d4c442e08191f075c3932d03140579d47`](6138d73be4..346a053d4c))
This commit is contained in:
Jacek Sieka
GitHub
parent
f05e7b0f48
commit
e123cf38ed
|
|
@ -1,4 +1,4 @@
|
||||||
[submodule "secp256k1_wrapper/secp256k1"]
|
[submodule "secp256k1_wrapper/secp256k1"]
|
||||||
path = secp256k1_wrapper/secp256k1
|
path = vendor/secp256k1
|
||||||
url = https://github.com/status-im/secp256k1.git
|
url = https://github.com/status-im/secp256k1.git
|
||||||
branch = master
|
branch = master
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
mode = ScriptMode.Verbose
|
mode = ScriptMode.Verbose
|
||||||
|
|
||||||
packageName = "secp256k1"
|
packageName = "secp256k1"
|
||||||
version = "0.5.2"
|
version = "0.6.0.3.1"
|
||||||
author = "Status Research & Development GmbH"
|
author = "Status Research & Development GmbH"
|
||||||
description = "A wrapper for the libsecp256k1 C library"
|
description = "A wrapper for the libsecp256k1 C library"
|
||||||
license = "Apache License 2.0"
|
license = "Apache License 2.0"
|
||||||
skipDirs = @["tests"]
|
skipDirs = @["tests"]
|
||||||
installDirs = @["secp256k1_wrapper"]
|
installDirs = @["vendor"]
|
||||||
|
|
||||||
requires "nim >= 1.2.0",
|
requires "nim >= 1.2.0",
|
||||||
"stew",
|
"stew",
|
||||||
|
|
|
||||||
|
|
@ -2,20 +2,29 @@ import strutils
|
||||||
from os import DirSep, AltSep, quoteShell
|
from os import DirSep, AltSep, quoteShell
|
||||||
|
|
||||||
const
|
const
|
||||||
wrapperPath = currentSourcePath.rsplit({DirSep, AltSep}, 1)[0] &
|
vendorPath = currentSourcePath.rsplit({DirSep, AltSep}, 1)[0] &
|
||||||
"/../secp256k1_wrapper"
|
"/../vendor"
|
||||||
internalPath = wrapperPath & "/secp256k1"
|
internalPath = vendorPath & "/secp256k1"
|
||||||
srcPath = internalPath & "/src"
|
srcPath = internalPath & "/src"
|
||||||
|
|
||||||
{.passc: "-I" & quoteShell(wrapperPath).}
|
|
||||||
{.passc: "-I" & quoteShell(internalPath).}
|
|
||||||
{.passc: "-I" & quoteShell(srcPath).}
|
|
||||||
{.passc: "-DHAVE_CONFIG_H".}
|
|
||||||
|
|
||||||
when defined(amd64) and (defined(gcc) or defined(clang)):
|
when defined(amd64) and (defined(gcc) or defined(clang)):
|
||||||
{.passc: "-DUSE_ASM_X86_64"}
|
const asmFlags = " -DUSE_ASM_X86_64"
|
||||||
|
else:
|
||||||
|
const asmFlags = ""
|
||||||
|
|
||||||
|
const compileFlags =
|
||||||
|
"-DENABLE_MODULE_ECDH=1 -DENABLE_MODULE_RECOVERY=1 -DENABLE_MODULE_SCHNORRSIG=1 -DENABLE_MODULE_EXTRAKEYS=1" &
|
||||||
|
" -I" & quoteShell(internalPath) &
|
||||||
|
" -I" & quoteShell(srcPath) &
|
||||||
|
asmFlags
|
||||||
|
|
||||||
|
when (NimMajor, NimMinor) >= (1, 4):
|
||||||
|
{.compile(srcPath & "/secp256k1.c", compileFlags).}
|
||||||
|
else:
|
||||||
|
# Per-compile flags not supported in 1.2
|
||||||
|
{.passc: compileFlags.}
|
||||||
{.compile: srcPath & "/secp256k1.c".}
|
{.compile: srcPath & "/secp256k1.c".}
|
||||||
|
|
||||||
{.compile: srcPath & "/precomputed_ecmult.c".}
|
{.compile: srcPath & "/precomputed_ecmult.c".}
|
||||||
{.compile: srcPath & "/precomputed_ecmult_gen.c".}
|
{.compile: srcPath & "/precomputed_ecmult_gen.c".}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,347 +0,0 @@
|
||||||
# Updating secp256k1 dependency
|
|
||||||
|
|
||||||
```sh
|
|
||||||
git submodule update
|
|
||||||
./gen.sh
|
|
||||||
|
|
||||||
# Don't forget to commit the changes
|
|
||||||
```
|
|
||||||
|
|
||||||
## Arch specific defines
|
|
||||||
|
|
||||||
You can get a list of arch specific defines with clang via `clang -dM -E -x c /dev/null`
|
|
||||||
|
|
||||||
On a Mac with 10.13.3 (High Sierra) this gives
|
|
||||||
|
|
||||||
```
|
|
||||||
#define OBJC_NEW_PROPERTIES 1
|
|
||||||
#define _LP64 1
|
|
||||||
#define __APPLE_CC__ 6000
|
|
||||||
#define __APPLE__ 1
|
|
||||||
#define __ATOMIC_ACQUIRE 2
|
|
||||||
#define __ATOMIC_ACQ_REL 4
|
|
||||||
#define __ATOMIC_CONSUME 1
|
|
||||||
#define __ATOMIC_RELAXED 0
|
|
||||||
#define __ATOMIC_RELEASE 3
|
|
||||||
#define __ATOMIC_SEQ_CST 5
|
|
||||||
#define __BIGGEST_ALIGNMENT__ 16
|
|
||||||
#define __BLOCKS__ 1
|
|
||||||
#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
|
|
||||||
#define __CHAR16_TYPE__ unsigned short
|
|
||||||
#define __CHAR32_TYPE__ unsigned int
|
|
||||||
#define __CHAR_BIT__ 8
|
|
||||||
#define __CONSTANT_CFSTRINGS__ 1
|
|
||||||
#define __DBL_DECIMAL_DIG__ 17
|
|
||||||
#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
|
|
||||||
#define __DBL_DIG__ 15
|
|
||||||
#define __DBL_EPSILON__ 2.2204460492503131e-16
|
|
||||||
#define __DBL_HAS_DENORM__ 1
|
|
||||||
#define __DBL_HAS_INFINITY__ 1
|
|
||||||
#define __DBL_HAS_QUIET_NAN__ 1
|
|
||||||
#define __DBL_MANT_DIG__ 53
|
|
||||||
#define __DBL_MAX_10_EXP__ 308
|
|
||||||
#define __DBL_MAX_EXP__ 1024
|
|
||||||
#define __DBL_MAX__ 1.7976931348623157e+308
|
|
||||||
#define __DBL_MIN_10_EXP__ (-307)
|
|
||||||
#define __DBL_MIN_EXP__ (-1021)
|
|
||||||
#define __DBL_MIN__ 2.2250738585072014e-308
|
|
||||||
#define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__
|
|
||||||
#define __DYNAMIC__ 1
|
|
||||||
#define __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 101300
|
|
||||||
#define __FINITE_MATH_ONLY__ 0
|
|
||||||
#define __FLT_DECIMAL_DIG__ 9
|
|
||||||
#define __FLT_DENORM_MIN__ 1.40129846e-45F
|
|
||||||
#define __FLT_DIG__ 6
|
|
||||||
#define __FLT_EPSILON__ 1.19209290e-7F
|
|
||||||
#define __FLT_EVAL_METHOD__ 0
|
|
||||||
#define __FLT_HAS_DENORM__ 1
|
|
||||||
#define __FLT_HAS_INFINITY__ 1
|
|
||||||
#define __FLT_HAS_QUIET_NAN__ 1
|
|
||||||
#define __FLT_MANT_DIG__ 24
|
|
||||||
#define __FLT_MAX_10_EXP__ 38
|
|
||||||
#define __FLT_MAX_EXP__ 128
|
|
||||||
#define __FLT_MAX__ 3.40282347e+38F
|
|
||||||
#define __FLT_MIN_10_EXP__ (-37)
|
|
||||||
#define __FLT_MIN_EXP__ (-125)
|
|
||||||
#define __FLT_MIN__ 1.17549435e-38F
|
|
||||||
#define __FLT_RADIX__ 2
|
|
||||||
#define __FXSR__ 1
|
|
||||||
#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_INT_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_LONG_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
|
|
||||||
#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
|
|
||||||
#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
|
|
||||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
|
|
||||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 1
|
|
||||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
|
|
||||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
|
|
||||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
|
|
||||||
#define __GNUC_MINOR__ 2
|
|
||||||
#define __GNUC_PATCHLEVEL__ 1
|
|
||||||
#define __GNUC_STDC_INLINE__ 1
|
|
||||||
#define __GNUC__ 4
|
|
||||||
#define __GXX_ABI_VERSION 1002
|
|
||||||
#define __INT16_C_SUFFIX__
|
|
||||||
#define __INT16_FMTd__ "hd"
|
|
||||||
#define __INT16_FMTi__ "hi"
|
|
||||||
#define __INT16_MAX__ 32767
|
|
||||||
#define __INT16_TYPE__ short
|
|
||||||
#define __INT32_C_SUFFIX__
|
|
||||||
#define __INT32_FMTd__ "d"
|
|
||||||
#define __INT32_FMTi__ "i"
|
|
||||||
#define __INT32_MAX__ 2147483647
|
|
||||||
#define __INT32_TYPE__ int
|
|
||||||
#define __INT64_C_SUFFIX__ LL
|
|
||||||
#define __INT64_FMTd__ "lld"
|
|
||||||
#define __INT64_FMTi__ "lli"
|
|
||||||
#define __INT64_MAX__ 9223372036854775807LL
|
|
||||||
#define __INT64_TYPE__ long long int
|
|
||||||
#define __INT8_C_SUFFIX__
|
|
||||||
#define __INT8_FMTd__ "hhd"
|
|
||||||
#define __INT8_FMTi__ "hhi"
|
|
||||||
#define __INT8_MAX__ 127
|
|
||||||
#define __INT8_TYPE__ signed char
|
|
||||||
#define __INTMAX_C_SUFFIX__ L
|
|
||||||
#define __INTMAX_FMTd__ "ld"
|
|
||||||
#define __INTMAX_FMTi__ "li"
|
|
||||||
#define __INTMAX_MAX__ 9223372036854775807L
|
|
||||||
#define __INTMAX_TYPE__ long int
|
|
||||||
#define __INTMAX_WIDTH__ 64
|
|
||||||
#define __INTPTR_FMTd__ "ld"
|
|
||||||
#define __INTPTR_FMTi__ "li"
|
|
||||||
#define __INTPTR_MAX__ 9223372036854775807L
|
|
||||||
#define __INTPTR_TYPE__ long int
|
|
||||||
#define __INTPTR_WIDTH__ 64
|
|
||||||
#define __INT_FAST16_FMTd__ "hd"
|
|
||||||
#define __INT_FAST16_FMTi__ "hi"
|
|
||||||
#define __INT_FAST16_MAX__ 32767
|
|
||||||
#define __INT_FAST16_TYPE__ short
|
|
||||||
#define __INT_FAST32_FMTd__ "d"
|
|
||||||
#define __INT_FAST32_FMTi__ "i"
|
|
||||||
#define __INT_FAST32_MAX__ 2147483647
|
|
||||||
#define __INT_FAST32_TYPE__ int
|
|
||||||
#define __INT_FAST64_FMTd__ "ld"
|
|
||||||
#define __INT_FAST64_FMTi__ "li"
|
|
||||||
#define __INT_FAST64_MAX__ 9223372036854775807L
|
|
||||||
#define __INT_FAST64_TYPE__ long int
|
|
||||||
#define __INT_FAST8_FMTd__ "hhd"
|
|
||||||
#define __INT_FAST8_FMTi__ "hhi"
|
|
||||||
#define __INT_FAST8_MAX__ 127
|
|
||||||
#define __INT_FAST8_TYPE__ signed char
|
|
||||||
#define __INT_LEAST16_FMTd__ "hd"
|
|
||||||
#define __INT_LEAST16_FMTi__ "hi"
|
|
||||||
#define __INT_LEAST16_MAX__ 32767
|
|
||||||
#define __INT_LEAST16_TYPE__ short
|
|
||||||
#define __INT_LEAST32_FMTd__ "d"
|
|
||||||
#define __INT_LEAST32_FMTi__ "i"
|
|
||||||
#define __INT_LEAST32_MAX__ 2147483647
|
|
||||||
#define __INT_LEAST32_TYPE__ int
|
|
||||||
#define __INT_LEAST64_FMTd__ "ld"
|
|
||||||
#define __INT_LEAST64_FMTi__ "li"
|
|
||||||
#define __INT_LEAST64_MAX__ 9223372036854775807L
|
|
||||||
#define __INT_LEAST64_TYPE__ long int
|
|
||||||
#define __INT_LEAST8_FMTd__ "hhd"
|
|
||||||
#define __INT_LEAST8_FMTi__ "hhi"
|
|
||||||
#define __INT_LEAST8_MAX__ 127
|
|
||||||
#define __INT_LEAST8_TYPE__ signed char
|
|
||||||
#define __INT_MAX__ 2147483647
|
|
||||||
#define __LDBL_DECIMAL_DIG__ 21
|
|
||||||
#define __LDBL_DENORM_MIN__ 3.64519953188247460253e-4951L
|
|
||||||
#define __LDBL_DIG__ 18
|
|
||||||
#define __LDBL_EPSILON__ 1.08420217248550443401e-19L
|
|
||||||
#define __LDBL_HAS_DENORM__ 1
|
|
||||||
#define __LDBL_HAS_INFINITY__ 1
|
|
||||||
#define __LDBL_HAS_QUIET_NAN__ 1
|
|
||||||
#define __LDBL_MANT_DIG__ 64
|
|
||||||
#define __LDBL_MAX_10_EXP__ 4932
|
|
||||||
#define __LDBL_MAX_EXP__ 16384
|
|
||||||
#define __LDBL_MAX__ 1.18973149535723176502e+4932L
|
|
||||||
#define __LDBL_MIN_10_EXP__ (-4931)
|
|
||||||
#define __LDBL_MIN_EXP__ (-16381)
|
|
||||||
#define __LDBL_MIN__ 3.36210314311209350626e-4932L
|
|
||||||
#define __LITTLE_ENDIAN__ 1
|
|
||||||
#define __LONG_LONG_MAX__ 9223372036854775807LL
|
|
||||||
#define __LONG_MAX__ 9223372036854775807L
|
|
||||||
#define __LP64__ 1
|
|
||||||
#define __MACH__ 1
|
|
||||||
#define __MMX__ 1
|
|
||||||
#define __NO_INLINE__ 1
|
|
||||||
#define __NO_MATH_INLINES 1
|
|
||||||
#define __OBJC_BOOL_IS_BOOL 0
|
|
||||||
#define __ORDER_BIG_ENDIAN__ 4321
|
|
||||||
#define __ORDER_LITTLE_ENDIAN__ 1234
|
|
||||||
#define __ORDER_PDP_ENDIAN__ 3412
|
|
||||||
#define __PIC__ 2
|
|
||||||
#define __POINTER_WIDTH__ 64
|
|
||||||
#define __PRAGMA_REDEFINE_EXTNAME 1
|
|
||||||
#define __PTRDIFF_FMTd__ "ld"
|
|
||||||
#define __PTRDIFF_FMTi__ "li"
|
|
||||||
#define __PTRDIFF_MAX__ 9223372036854775807L
|
|
||||||
#define __PTRDIFF_TYPE__ long int
|
|
||||||
#define __PTRDIFF_WIDTH__ 64
|
|
||||||
#define __REGISTER_PREFIX__
|
|
||||||
#define __SCHAR_MAX__ 127
|
|
||||||
#define __SHRT_MAX__ 32767
|
|
||||||
#define __SIG_ATOMIC_MAX__ 2147483647
|
|
||||||
#define __SIG_ATOMIC_WIDTH__ 32
|
|
||||||
#define __SIZEOF_DOUBLE__ 8
|
|
||||||
#define __SIZEOF_FLOAT__ 4
|
|
||||||
#define __SIZEOF_INT128__ 16
|
|
||||||
#define __SIZEOF_INT__ 4
|
|
||||||
#define __SIZEOF_LONG_DOUBLE__ 16
|
|
||||||
#define __SIZEOF_LONG_LONG__ 8
|
|
||||||
#define __SIZEOF_LONG__ 8
|
|
||||||
#define __SIZEOF_POINTER__ 8
|
|
||||||
#define __SIZEOF_PTRDIFF_T__ 8
|
|
||||||
#define __SIZEOF_SHORT__ 2
|
|
||||||
#define __SIZEOF_SIZE_T__ 8
|
|
||||||
#define __SIZEOF_WCHAR_T__ 4
|
|
||||||
#define __SIZEOF_WINT_T__ 4
|
|
||||||
#define __SIZE_FMTX__ "lX"
|
|
||||||
#define __SIZE_FMTo__ "lo"
|
|
||||||
#define __SIZE_FMTu__ "lu"
|
|
||||||
#define __SIZE_FMTx__ "lx"
|
|
||||||
#define __SIZE_MAX__ 18446744073709551615UL
|
|
||||||
#define __SIZE_TYPE__ long unsigned int
|
|
||||||
#define __SIZE_WIDTH__ 64
|
|
||||||
#define __SSE2_MATH__ 1
|
|
||||||
#define __SSE2__ 1
|
|
||||||
#define __SSE3__ 1
|
|
||||||
#define __SSE4_1__ 1
|
|
||||||
#define __SSE_MATH__ 1
|
|
||||||
#define __SSE__ 1
|
|
||||||
#define __SSP__ 1
|
|
||||||
#define __SSSE3__ 1
|
|
||||||
#define __STDC_HOSTED__ 1
|
|
||||||
#define __STDC_NO_THREADS__ 1
|
|
||||||
#define __STDC_UTF_16__ 1
|
|
||||||
#define __STDC_UTF_32__ 1
|
|
||||||
#define __STDC_VERSION__ 201112L
|
|
||||||
#define __STDC__ 1
|
|
||||||
#define __UINT16_C_SUFFIX__
|
|
||||||
#define __UINT16_FMTX__ "hX"
|
|
||||||
#define __UINT16_FMTo__ "ho"
|
|
||||||
#define __UINT16_FMTu__ "hu"
|
|
||||||
#define __UINT16_FMTx__ "hx"
|
|
||||||
#define __UINT16_MAX__ 65535
|
|
||||||
#define __UINT16_TYPE__ unsigned short
|
|
||||||
#define __UINT32_C_SUFFIX__ U
|
|
||||||
#define __UINT32_FMTX__ "X"
|
|
||||||
#define __UINT32_FMTo__ "o"
|
|
||||||
#define __UINT32_FMTu__ "u"
|
|
||||||
#define __UINT32_FMTx__ "x"
|
|
||||||
#define __UINT32_MAX__ 4294967295U
|
|
||||||
#define __UINT32_TYPE__ unsigned int
|
|
||||||
#define __UINT64_C_SUFFIX__ ULL
|
|
||||||
#define __UINT64_FMTX__ "llX"
|
|
||||||
#define __UINT64_FMTo__ "llo"
|
|
||||||
#define __UINT64_FMTu__ "llu"
|
|
||||||
#define __UINT64_FMTx__ "llx"
|
|
||||||
#define __UINT64_MAX__ 18446744073709551615ULL
|
|
||||||
#define __UINT64_TYPE__ long long unsigned int
|
|
||||||
#define __UINT8_C_SUFFIX__
|
|
||||||
#define __UINT8_FMTX__ "hhX"
|
|
||||||
#define __UINT8_FMTo__ "hho"
|
|
||||||
#define __UINT8_FMTu__ "hhu"
|
|
||||||
#define __UINT8_FMTx__ "hhx"
|
|
||||||
#define __UINT8_MAX__ 255
|
|
||||||
#define __UINT8_TYPE__ unsigned char
|
|
||||||
#define __UINTMAX_C_SUFFIX__ UL
|
|
||||||
#define __UINTMAX_FMTX__ "lX"
|
|
||||||
#define __UINTMAX_FMTo__ "lo"
|
|
||||||
#define __UINTMAX_FMTu__ "lu"
|
|
||||||
#define __UINTMAX_FMTx__ "lx"
|
|
||||||
#define __UINTMAX_MAX__ 18446744073709551615UL
|
|
||||||
#define __UINTMAX_TYPE__ long unsigned int
|
|
||||||
#define __UINTMAX_WIDTH__ 64
|
|
||||||
#define __UINTPTR_FMTX__ "lX"
|
|
||||||
#define __UINTPTR_FMTo__ "lo"
|
|
||||||
#define __UINTPTR_FMTu__ "lu"
|
|
||||||
#define __UINTPTR_FMTx__ "lx"
|
|
||||||
#define __UINTPTR_MAX__ 18446744073709551615UL
|
|
||||||
#define __UINTPTR_TYPE__ long unsigned int
|
|
||||||
#define __UINTPTR_WIDTH__ 64
|
|
||||||
#define __UINT_FAST16_FMTX__ "hX"
|
|
||||||
#define __UINT_FAST16_FMTo__ "ho"
|
|
||||||
#define __UINT_FAST16_FMTu__ "hu"
|
|
||||||
#define __UINT_FAST16_FMTx__ "hx"
|
|
||||||
#define __UINT_FAST16_MAX__ 65535
|
|
||||||
#define __UINT_FAST16_TYPE__ unsigned short
|
|
||||||
#define __UINT_FAST32_FMTX__ "X"
|
|
||||||
#define __UINT_FAST32_FMTo__ "o"
|
|
||||||
#define __UINT_FAST32_FMTu__ "u"
|
|
||||||
#define __UINT_FAST32_FMTx__ "x"
|
|
||||||
#define __UINT_FAST32_MAX__ 4294967295U
|
|
||||||
#define __UINT_FAST32_TYPE__ unsigned int
|
|
||||||
#define __UINT_FAST64_FMTX__ "lX"
|
|
||||||
#define __UINT_FAST64_FMTo__ "lo"
|
|
||||||
#define __UINT_FAST64_FMTu__ "lu"
|
|
||||||
#define __UINT_FAST64_FMTx__ "lx"
|
|
||||||
#define __UINT_FAST64_MAX__ 18446744073709551615UL
|
|
||||||
#define __UINT_FAST64_TYPE__ long unsigned int
|
|
||||||
#define __UINT_FAST8_FMTX__ "hhX"
|
|
||||||
#define __UINT_FAST8_FMTo__ "hho"
|
|
||||||
#define __UINT_FAST8_FMTu__ "hhu"
|
|
||||||
#define __UINT_FAST8_FMTx__ "hhx"
|
|
||||||
#define __UINT_FAST8_MAX__ 255
|
|
||||||
#define __UINT_FAST8_TYPE__ unsigned char
|
|
||||||
#define __UINT_LEAST16_FMTX__ "hX"
|
|
||||||
#define __UINT_LEAST16_FMTo__ "ho"
|
|
||||||
#define __UINT_LEAST16_FMTu__ "hu"
|
|
||||||
#define __UINT_LEAST16_FMTx__ "hx"
|
|
||||||
#define __UINT_LEAST16_MAX__ 65535
|
|
||||||
#define __UINT_LEAST16_TYPE__ unsigned short
|
|
||||||
#define __UINT_LEAST32_FMTX__ "X"
|
|
||||||
#define __UINT_LEAST32_FMTo__ "o"
|
|
||||||
#define __UINT_LEAST32_FMTu__ "u"
|
|
||||||
#define __UINT_LEAST32_FMTx__ "x"
|
|
||||||
#define __UINT_LEAST32_MAX__ 4294967295U
|
|
||||||
#define __UINT_LEAST32_TYPE__ unsigned int
|
|
||||||
#define __UINT_LEAST64_FMTX__ "lX"
|
|
||||||
#define __UINT_LEAST64_FMTo__ "lo"
|
|
||||||
#define __UINT_LEAST64_FMTu__ "lu"
|
|
||||||
#define __UINT_LEAST64_FMTx__ "lx"
|
|
||||||
#define __UINT_LEAST64_MAX__ 18446744073709551615UL
|
|
||||||
#define __UINT_LEAST64_TYPE__ long unsigned int
|
|
||||||
#define __UINT_LEAST8_FMTX__ "hhX"
|
|
||||||
#define __UINT_LEAST8_FMTo__ "hho"
|
|
||||||
#define __UINT_LEAST8_FMTu__ "hhu"
|
|
||||||
#define __UINT_LEAST8_FMTx__ "hhx"
|
|
||||||
#define __UINT_LEAST8_MAX__ 255
|
|
||||||
#define __UINT_LEAST8_TYPE__ unsigned char
|
|
||||||
#define __USER_LABEL_PREFIX__ _
|
|
||||||
#define __VERSION__ "4.2.1 Compatible Apple LLVM 9.0.0 (clang-900.0.39.2)"
|
|
||||||
#define __WCHAR_MAX__ 2147483647
|
|
||||||
#define __WCHAR_TYPE__ int
|
|
||||||
#define __WCHAR_WIDTH__ 32
|
|
||||||
#define __WINT_TYPE__ int
|
|
||||||
#define __WINT_WIDTH__ 32
|
|
||||||
#define __amd64 1
|
|
||||||
#define __amd64__ 1
|
|
||||||
#define __apple_build_version__ 9000039
|
|
||||||
#define __block __attribute__((__blocks__(byref)))
|
|
||||||
#define __clang__ 1
|
|
||||||
#define __clang_major__ 9
|
|
||||||
#define __clang_minor__ 0
|
|
||||||
#define __clang_patchlevel__ 0
|
|
||||||
#define __clang_version__ "9.0.0 (clang-900.0.39.2)"
|
|
||||||
#define __core2 1
|
|
||||||
#define __core2__ 1
|
|
||||||
#define __llvm__ 1
|
|
||||||
#define __nonnull _Nonnull
|
|
||||||
#define __null_unspecified _Null_unspecified
|
|
||||||
#define __nullable _Nullable
|
|
||||||
#define __pic__ 2
|
|
||||||
#define __strong
|
|
||||||
#define __tune_core2__ 1
|
|
||||||
#define __unsafe_unretained
|
|
||||||
#define __weak __attribute__((objc_gc(weak)))
|
|
||||||
#define __x86_64 1
|
|
||||||
#define __x86_64__ 1
|
|
||||||
```
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,13 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
THIS_DIR=$(dirname "$0")
|
|
||||||
cd $THIS_DIR/secp256k1
|
|
||||||
./autogen.sh
|
|
||||||
./configure --enable-module-ecdh --enable-module-recovery --enable-module-extrakeys --enable-module-schnorrsig --enable-experimental
|
|
||||||
make src/ecmult_static_context.h
|
|
||||||
|
|
||||||
cd -
|
|
||||||
cp secp256k1/src/ecmult_static_context.h "$THIS_DIR"
|
|
||||||
cp secp256k1/src/libsecp256k1-config.h "$THIS_DIR"
|
|
||||||
|
|
@ -1,118 +0,0 @@
|
||||||
/* src/libsecp256k1-config.h. Generated from libsecp256k1-config.h.in by configure. */
|
|
||||||
/* src/libsecp256k1-config.h.in. Generated from configure.ac by autoheader. */
|
|
||||||
|
|
||||||
#ifndef LIBSECP256K1_CONFIG_H
|
|
||||||
|
|
||||||
#define LIBSECP256K1_CONFIG_H
|
|
||||||
|
|
||||||
/* Define this symbol to compile out all VERIFY code */
|
|
||||||
/* #undef COVERAGE */
|
|
||||||
|
|
||||||
/* Set ecmult gen precision bits */
|
|
||||||
/* #define ECMULT_GEN_PREC_BITS 4 */
|
|
||||||
|
|
||||||
/* Set window size for ecmult precomputation */
|
|
||||||
/* #define ECMULT_WINDOW_SIZE 15 */
|
|
||||||
|
|
||||||
/* Define this symbol to enable the ECDH module */
|
|
||||||
#define ENABLE_MODULE_ECDH 1
|
|
||||||
|
|
||||||
/* Define this symbol to enable the extrakeys module */
|
|
||||||
#define ENABLE_MODULE_EXTRAKEYS 1
|
|
||||||
|
|
||||||
/* Define this symbol to enable the ECDSA pubkey recovery module */
|
|
||||||
#define ENABLE_MODULE_RECOVERY 1
|
|
||||||
|
|
||||||
/* Define this symbol to enable the schnorrsig module */
|
|
||||||
#define ENABLE_MODULE_SCHNORRSIG 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
|
||||||
#define HAVE_DLFCN_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
|
||||||
#define HAVE_INTTYPES_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdint.h> header file. */
|
|
||||||
#define HAVE_STDINT_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdio.h> header file. */
|
|
||||||
#define HAVE_STDIO_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
|
||||||
#define HAVE_STDLIB_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <strings.h> header file. */
|
|
||||||
#define HAVE_STRINGS_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <string.h> header file. */
|
|
||||||
#define HAVE_STRING_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
||||||
#define HAVE_SYS_STAT_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
|
||||||
#define HAVE_SYS_TYPES_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
|
||||||
#define HAVE_UNISTD_H 1
|
|
||||||
|
|
||||||
/* Define this symbol if valgrind is installed, and it supports the host
|
|
||||||
platform */
|
|
||||||
/* #undef HAVE_VALGRIND */
|
|
||||||
|
|
||||||
/* Define to the sub-directory where libtool stores uninstalled libraries. */
|
|
||||||
#define LT_OBJDIR ".libs/"
|
|
||||||
|
|
||||||
/* Name of package */
|
|
||||||
#define PACKAGE "libsecp256k1"
|
|
||||||
|
|
||||||
/* Define to the address where bug reports for this package should be sent. */
|
|
||||||
#define PACKAGE_BUGREPORT "https://github.com/bitcoin-core/secp256k1/issues"
|
|
||||||
|
|
||||||
/* Define to the full name of this package. */
|
|
||||||
#define PACKAGE_NAME "libsecp256k1"
|
|
||||||
|
|
||||||
/* Define to the full name and version of this package. */
|
|
||||||
#define PACKAGE_STRING "libsecp256k1 0.1.0-pre"
|
|
||||||
|
|
||||||
/* Define to the one symbol short name of this package. */
|
|
||||||
#define PACKAGE_TARNAME "libsecp256k1"
|
|
||||||
|
|
||||||
/* Define to the home page for this package. */
|
|
||||||
#define PACKAGE_URL "https://github.com/bitcoin-core/secp256k1"
|
|
||||||
|
|
||||||
/* Define to the version of this package. */
|
|
||||||
#define PACKAGE_VERSION "0.1.0-pre"
|
|
||||||
|
|
||||||
/* Define to 1 if all of the C90 standard headers exist (not just the ones
|
|
||||||
required in a freestanding environment). This macro is provided for
|
|
||||||
backward compatibility; new code need not use it. */
|
|
||||||
#define STDC_HEADERS 1
|
|
||||||
|
|
||||||
/* Define this symbol to enable x86_64 assembly optimizations */
|
|
||||||
/* #define USE_ASM_X86_64 1 */
|
|
||||||
|
|
||||||
/* Define this symbol if an external (non-inline) assembly implementation is
|
|
||||||
used */
|
|
||||||
/* #undef USE_EXTERNAL_ASM */
|
|
||||||
|
|
||||||
/* Define this symbol if an external implementation of the default callbacks
|
|
||||||
is used */
|
|
||||||
/* #undef USE_EXTERNAL_DEFAULT_CALLBACKS */
|
|
||||||
|
|
||||||
/* Define this symbol to force the use of the (unsigned) __int128 based wide
|
|
||||||
multiplication implementation */
|
|
||||||
/* #undef USE_FORCE_WIDEMUL_INT128 */
|
|
||||||
|
|
||||||
/* Define this symbol to force the use of the structure for simulating
|
|
||||||
(unsigned) int128 based wide multiplication */
|
|
||||||
/* #undef USE_FORCE_WIDEMUL_INT128_STRUCT */
|
|
||||||
|
|
||||||
/* Define this symbol to force the use of the (u)int64_t based wide
|
|
||||||
multiplication implementation */
|
|
||||||
/* #undef USE_FORCE_WIDEMUL_INT64 */
|
|
||||||
|
|
||||||
/* Version number of package */
|
|
||||||
#define VERSION "0.1.0-pre"
|
|
||||||
|
|
||||||
#endif /*LIBSECP256K1_CONFIG_H*/
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit c697875039954bdde415d92f3ca0af32c517309d
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
This folder contains a copy of [secp256k1](https://github.com/bitcoin-core/secp256k1) that's been forked to expose an [`secp256k1_ecdh_raw`](https://github.com/status-im/secp256k1/blob/master/src/modules/ecdh/main_impl.h#L71).
|
||||||
|
|
||||||
|
To update, rebase the fork then repoint this submodule.
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 1dd68bcd47b053673a34cd83490d79d787da1585
|
||||||
Loading…
Reference in New Issue