Update for SECP256K1 v0.4.1

MANIFEST.in

@@ -1,4 +1,5 @@
 include coincurve/py.typed
 include setup_support.py
 recursive-include _cffi_build *.py *.h
+prune /*
 graft libsecp256k1

_cffi_build/build.py

@@ -29,6 +29,8 @@ def _mk_ffi(sources, name='_libsecp256k1', **kwargs):
     Source('secp256k1_extrakeys.h', '#include <secp256k1_extrakeys.h>'),
     Source('secp256k1_recovery.h', '#include <secp256k1_recovery.h>'),
     Source('secp256k1_schnorrsig.h', '#include <secp256k1_schnorrsig.h>'),
+    Source('secp256k1_ellswift.h', '#include <secp256k1_ellswift.h>'),
+    Source('secp256k1_preallocated.h', '#include <secp256k1_preallocated.h>'),
 ]
 
 ffi = _mk_ffi(modules, libraries=['secp256k1'])

_cffi_build/secp256k1.h

@@ -1,14 +1,11 @@
 typedef struct secp256k1_context_struct secp256k1_context;
 typedef struct secp256k1_scratch_space_struct secp256k1_scratch_space;
-
 typedef struct {
     unsigned char data[64];
 } secp256k1_pubkey;
-
 typedef struct {
     unsigned char data[64];
 } secp256k1_ecdsa_signature;
-
 typedef int (*secp256k1_nonce_function)(
     unsigned char *nonce32,
     const unsigned char *msg32,
@@ -17,172 +14,183 @@ typedef int (*secp256k1_nonce_function)(
     void *data,
     unsigned int attempt
 );
-
 #define SECP256K1_FLAGS_TYPE_MASK ...
 #define SECP256K1_FLAGS_TYPE_CONTEXT ...
 #define SECP256K1_FLAGS_TYPE_COMPRESSION ...
 #define SECP256K1_FLAGS_BIT_CONTEXT_VERIFY ...
 #define SECP256K1_FLAGS_BIT_CONTEXT_SIGN ...
 #define SECP256K1_FLAGS_BIT_CONTEXT_DECLASSIFY ...
 #define SECP256K1_FLAGS_BIT_COMPRESSION ...
-
 #define SECP256K1_CONTEXT_NONE ...
-
 #define SECP256K1_CONTEXT_VERIFY ...
 #define SECP256K1_CONTEXT_SIGN ...
-
 #define SECP256K1_CONTEXT_DECLASSIFY ...
-
 #define SECP256K1_EC_COMPRESSED ...
 #define SECP256K1_EC_UNCOMPRESSED ...
-
 #define SECP256K1_TAG_PUBKEY_EVEN ...
 #define SECP256K1_TAG_PUBKEY_ODD ...
 #define SECP256K1_TAG_PUBKEY_UNCOMPRESSED ...
-#define SECP256K1_TAG_PUBKEY_HYBRID_EVEN ...
-#define SECP256K1_TAG_PUBKEY_HYBRID_ODD ...
-
-void secp256k1_selftest(void);
-
-secp256k1_context* secp256k1_context_create(
+extern const secp256k1_context *secp256k1_context_static;
+extern const secp256k1_context *secp256k1_context_no_precomp
+;
+extern void secp256k1_selftest(void);
+extern secp256k1_context *secp256k1_context_create(
     unsigned int flags
-);
-
-secp256k1_context* secp256k1_context_clone(
-    const secp256k1_context* ctx
-);
-
-void secp256k1_context_destroy(
-    secp256k1_context* ctx
-);
-
-void secp256k1_context_set_illegal_callback(
-    secp256k1_context* ctx,
-    void (*fun)(const char* message, void* data),
-    const void* data
-);
-
-void secp256k1_context_set_error_callback(
-    secp256k1_context* ctx,
-    void (*fun)(const char* message, void* data),
-    const void* data
-);
-
-secp256k1_scratch_space* secp256k1_scratch_space_create(
-    const secp256k1_context* ctx,
+) ;
+extern secp256k1_context *secp256k1_context_clone(
+    const secp256k1_context *ctx
+) ;
+extern void secp256k1_context_destroy(
+    secp256k1_context *ctx
+) ;
+extern void secp256k1_context_set_illegal_callback(
+    secp256k1_context *ctx,
+    void (*fun)(const char *message, void *data),
+    const void *data
+) ;
+extern void secp256k1_context_set_error_callback(
+    secp256k1_context *ctx,
+    void (*fun)(const char *message, void *data),
+    const void *data
+) ;
+extern secp256k1_scratch_space *secp256k1_scratch_space_create(
+    const secp256k1_context *ctx,
     size_t size
-);
-
-int secp256k1_ec_pubkey_parse(
-    const secp256k1_context* ctx,
-    secp256k1_pubkey* pubkey,
+) ;
+extern void secp256k1_scratch_space_destroy(
+    const secp256k1_context *ctx,
+    secp256k1_scratch_space *scratch
+) ;
+extern int secp256k1_ec_pubkey_parse(
+    const secp256k1_context *ctx,
+    secp256k1_pubkey *pubkey,
     const unsigned char *input,
     size_t inputlen
-);
-
-int secp256k1_ec_pubkey_serialize(
-    const secp256k1_context* ctx,
+) ;
+extern int secp256k1_ec_pubkey_serialize(
+    const secp256k1_context *ctx,
     unsigned char *output,
     size_t *outputlen,
-    const secp256k1_pubkey* pubkey,
+    const secp256k1_pubkey *pubkey,
     unsigned int flags
-);
-
-int secp256k1_ecdsa_signature_parse_compact(
-    const secp256k1_context* ctx,
-    secp256k1_ecdsa_signature* sig,
+) ;
+extern int secp256k1_ec_pubkey_cmp(
+    const secp256k1_context *ctx,
+    const secp256k1_pubkey *pubkey1,
+    const secp256k1_pubkey *pubkey2
+) ;
+extern int secp256k1_ecdsa_signature_parse_compact(
+    const secp256k1_context *ctx,
+    secp256k1_ecdsa_signature *sig,
     const unsigned char *input64
-);
-
-int secp256k1_ecdsa_signature_parse_der(
-    const secp256k1_context* ctx,
-    secp256k1_ecdsa_signature* sig,
+) ;
+extern int secp256k1_ecdsa_signature_parse_der(
+    const secp256k1_context *ctx,
+    secp256k1_ecdsa_signature *sig,
     const unsigned char *input,
     size_t inputlen
-);
-
-int secp256k1_ecdsa_signature_serialize_der(
-    const secp256k1_context* ctx,
+) ;
+extern int secp256k1_ecdsa_signature_serialize_der(
+    const secp256k1_context *ctx,
     unsigned char *output,
     size_t *outputlen,
-    const secp256k1_ecdsa_signature* sig
-);
-
-int secp256k1_ecdsa_signature_serialize_compact(
-    const secp256k1_context* ctx,
+    const secp256k1_ecdsa_signature *sig
+) ;
+extern int secp256k1_ecdsa_signature_serialize_compact(
+    const secp256k1_context *ctx,
     unsigned char *output64,
-    const secp256k1_ecdsa_signature* sig
-);
-
-int secp256k1_ecdsa_verify(
-    const secp256k1_context* ctx,
+    const secp256k1_ecdsa_signature *sig
+) ;
+extern int secp256k1_ecdsa_verify(
+    const secp256k1_context *ctx,
     const secp256k1_ecdsa_signature *sig,
-    const unsigned char *msg32,
+    const unsigned char *msghash32,
     const secp256k1_pubkey *pubkey
-);
-
-int secp256k1_ecdsa_signature_normalize(
-    const secp256k1_context* ctx,
+) ;
+extern int secp256k1_ecdsa_signature_normalize(
+    const secp256k1_context *ctx,
     secp256k1_ecdsa_signature *sigout,
     const secp256k1_ecdsa_signature *sigin
-);
-
+) ;
 extern const secp256k1_nonce_function secp256k1_nonce_function_rfc6979;
-
 extern const secp256k1_nonce_function secp256k1_nonce_function_default;
-
-int secp256k1_ecdsa_sign(
-    const secp256k1_context* ctx,
+extern int secp256k1_ecdsa_sign(
+    const secp256k1_context *ctx,
     secp256k1_ecdsa_signature *sig,
-    const unsigned char *msg32,
+    const unsigned char *msghash32,
     const unsigned char *seckey,
     secp256k1_nonce_function noncefp,
     const void *ndata
-);
-
-int secp256k1_ec_seckey_verify(
-    const secp256k1_context* ctx,
+) ;
+extern int secp256k1_ec_seckey_verify(
+    const secp256k1_context *ctx,
     const unsigned char *seckey
-);
-
-int secp256k1_ec_pubkey_create(
-    const secp256k1_context* ctx,
+) ;
+extern int secp256k1_ec_pubkey_create(
+    const secp256k1_context *ctx,
     secp256k1_pubkey *pubkey,
     const unsigned char *seckey
-);
-
-int secp256k1_ec_privkey_tweak_add(
-    const secp256k1_context* ctx,
+) ;
+extern int secp256k1_ec_seckey_negate(
+    const secp256k1_context *ctx,
+    unsigned char *seckey
+) ;
+extern int secp256k1_ec_privkey_negate(
+    const secp256k1_context *ctx,
+    unsigned char *seckey
+)
+  ;
+extern int secp256k1_ec_pubkey_negate(
+    const secp256k1_context *ctx,
+    secp256k1_pubkey *pubkey
+) ;
+extern int secp256k1_ec_seckey_tweak_add(
+    const secp256k1_context *ctx,
     unsigned char *seckey,
-    const unsigned char *tweak
-);
-
-int secp256k1_ec_pubkey_tweak_add(
-    const secp256k1_context* ctx,
+    const unsigned char *tweak32
+) ;
+extern int secp256k1_ec_privkey_tweak_add(
+    const secp256k1_context *ctx,
+    unsigned char *seckey,
+    const unsigned char *tweak32
+)
+  ;
+extern int secp256k1_ec_pubkey_tweak_add(
+    const secp256k1_context *ctx,
     secp256k1_pubkey *pubkey,
-    const unsigned char *tweak
-);
-
-int secp256k1_ec_privkey_tweak_mul(
-    const secp256k1_context* ctx,
+    const unsigned char *tweak32
+) ;
+extern int secp256k1_ec_seckey_tweak_mul(
+    const secp256k1_context *ctx,
     unsigned char *seckey,
-    const unsigned char *tweak
-);
-
-int secp256k1_ec_pubkey_tweak_mul(
-    const secp256k1_context* ctx,
+    const unsigned char *tweak32
+) ;
+extern int secp256k1_ec_privkey_tweak_mul(
+    const secp256k1_context *ctx,
+    unsigned char *seckey,
+    const unsigned char *tweak32
+)
+  ;
+extern int secp256k1_ec_pubkey_tweak_mul(
+    const secp256k1_context *ctx,
     secp256k1_pubkey *pubkey,
-    const unsigned char *tweak
-);
-
-int secp256k1_context_randomize(
-    secp256k1_context* ctx,
+    const unsigned char *tweak32
+) ;
+extern int secp256k1_context_randomize(
+    secp256k1_context *ctx,
     const unsigned char *seed32
-);
-
-int secp256k1_ec_pubkey_combine(
-    const secp256k1_context* ctx,
+) ;
+extern int secp256k1_ec_pubkey_combine(
+    const secp256k1_context *ctx,
     secp256k1_pubkey *out,
-    const secp256k1_pubkey * const * ins,
+    const secp256k1_pubkey * const *ins,
     size_t n
-);
+) ;
+extern int secp256k1_tagged_sha256(
+    const secp256k1_context *ctx,
+    unsigned char *hash32,
+    const unsigned char *tag,
+    size_t taglen,
+    const unsigned char *msg,
+    size_t msglen
+) ;

_cffi_build/secp256k1_ecdh.h

@@ -1,8 +1,16 @@
-int secp256k1_ecdh(
-  const secp256k1_context* ctx,
-  unsigned char *result,
-  const secp256k1_pubkey *pubkey,
-  const unsigned char *privkey,
-  void *hashfp,
+typedef int (*secp256k1_ecdh_hash_function)(
+  unsigned char *output,
+  const unsigned char *x32,
+  const unsigned char *y32,
   void *data
 );
+extern const secp256k1_ecdh_hash_function secp256k1_ecdh_hash_function_sha256;
+extern const secp256k1_ecdh_hash_function secp256k1_ecdh_hash_function_default;
+extern int secp256k1_ecdh(
+  const secp256k1_context *ctx,
+  unsigned char *output,
+  const secp256k1_pubkey *pubkey,
+  const unsigned char *seckey,
+  secp256k1_ecdh_hash_function hashfp,
+  void *data
+) ;

_cffi_build/secp256k1_ellswift.h

@@ -0,0 +1,36 @@
+typedef int (*secp256k1_ellswift_xdh_hash_function)(
+    unsigned char *output,
+    const unsigned char *x32,
+    const unsigned char *ell_a64,
+    const unsigned char *ell_b64,
+    void *data
+);
+extern const secp256k1_ellswift_xdh_hash_function secp256k1_ellswift_xdh_hash_function_prefix;
+extern const secp256k1_ellswift_xdh_hash_function secp256k1_ellswift_xdh_hash_function_bip324;
+extern int secp256k1_ellswift_encode(
+    const secp256k1_context *ctx,
+    unsigned char *ell64,
+    const secp256k1_pubkey *pubkey,
+    const unsigned char *rnd32
+) ;
+extern int secp256k1_ellswift_decode(
+    const secp256k1_context *ctx,
+    secp256k1_pubkey *pubkey,
+    const unsigned char *ell64
+) ;
+extern int secp256k1_ellswift_create(
+    const secp256k1_context *ctx,
+    unsigned char *ell64,
+    const unsigned char *seckey32,
+    const unsigned char *auxrnd32
+) ;
+extern int secp256k1_ellswift_xdh(
+  const secp256k1_context *ctx,
+  unsigned char *output,
+  const unsigned char *ell_a64,
+  const unsigned char *ell_b64,
+  const unsigned char *seckey32,
+  int party,
+  secp256k1_ellswift_xdh_hash_function hashfp,
+  void *data
+) ;