Skip to content

Commit 7922d05

Browse files
Davidson-SouzaDavidson-Souza
committed
Update the upstream version of libsecp
This commit uses the `vendo-lebsecp.sh` script to update the vendored libsecp to revision cc55757
1 parent 9b76e13 commit 7922d05

File tree

121 files changed

+15453
-3239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+15453
-3239
lines changed

‎secp256k1-sys/build.rs

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ fn main() {
3636
#[cfg(feature = "recovery")]
3737
base_config.define("ENABLE_MODULE_RECOVERY", Some("1"));
3838

39+
base_config.define("ENABLE_MODULE_ELLSWIFT", Some("1"));
40+
3941
// WASM headers and size/align defines.
4042
if env::var("CARGO_CFG_TARGET_ARCH").unwrap() == "wasm32" {
4143
base_config.include("wasm/wasm-sysroot")

‎secp256k1-sys/depend/scratch_impl.h.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
13,37d12
2-
< static secp256k1_scratch* secp256k1_scratch_create(const secp256k1_callback* error_callback, size_t size) {
3-
< const size_t base_alloc = ROUND_TO_ALIGN(sizeof(secp256k1_scratch));
2+
< static rustsecp256k1_v0_8_1_scratch* rustsecp256k1_v0_8_1_scratch_create(const rustsecp256k1_v0_8_1_callback* error_callback, size_t size) {
3+
< const size_t base_alloc = ROUND_TO_ALIGN(sizeof(rustsecp256k1_v0_8_1_scratch));
44
< void *alloc = checked_malloc(error_callback, base_alloc + size);
5-
< secp256k1_scratch* ret = (secp256k1_scratch *)alloc;
5+
< rustsecp256k1_v0_8_1_scratch* ret = (rustsecp256k1_v0_8_1_scratch *)alloc;
66
< if (ret != NULL) {
77
< memset(ret, 0, sizeof(*ret));
88
< memcpy(ret->magic, "scratch", 8);
@@ -12,10 +12,10 @@
1212
< return ret;
1313
< }
1414
<
15-
< static void secp256k1_scratch_destroy(const secp256k1_callback* error_callback, secp256k1_scratch* scratch) {
15+
< static void rustsecp256k1_v0_8_1_scratch_destroy(const rustsecp256k1_v0_8_1_callback* error_callback, rustsecp256k1_v0_8_1_scratch* scratch) {
1616
< if (scratch != NULL) {
17-
< if (secp256k1_memcmp_var(scratch->magic, "scratch", 8) != 0) {
18-
< secp256k1_callback_call(error_callback, "invalid scratch space");
17+
< if (rustsecp256k1_v0_8_1_memcmp_var(scratch->magic, "scratch", 8) != 0) {
18+
< rustsecp256k1_v0_8_1_callback_call(error_callback, "invalid scratch space");
1919
< return;
2020
< }
2121
< VERIFY_CHECK(scratch->alloc_size == 0); /* all checkpoints should be applied */

‎secp256k1-sys/depend/secp256k1-HEAD-revision.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file was automatically created by vendor-libsecp.sh
2-
21ffe4b22a9683cf24ae0763359e401d1284cc7a
2+
cc557575522c4cf11e5bcde1fea9637339cea21f

‎secp256k1-sys/depend/secp256k1.c.patch

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
139,149d138
2-
< secp256k1_context* secp256k1_context_create(unsigned int flags) {
3-
< size_t const prealloc_size = secp256k1_context_preallocated_size(flags);
4-
< secp256k1_context* ctx = (secp256k1_context*)checked_malloc(&default_error_callback, prealloc_size);
5-
< if (EXPECT(secp256k1_context_preallocated_create(ctx, flags) == NULL, 0)) {
2+
< rustsecp256k1_v0_8_1_context* rustsecp256k1_v0_8_1_context_create(unsigned int flags) {
3+
< size_t const prealloc_size = rustsecp256k1_v0_8_1_context_preallocated_size(flags);
4+
< rustsecp256k1_v0_8_1_context* ctx = (rustsecp256k1_v0_8_1_context*)checked_malloc(&default_error_callback, prealloc_size);
5+
< if (EXPECT(rustsecp256k1_v0_8_1_context_preallocated_create(ctx, flags) == NULL, 0)) {
66
< free(ctx);
77
< return NULL;
88
< }
@@ -11,33 +11,33 @@
1111
< }
1212
<
1313
164,174d152
14-
< secp256k1_context* secp256k1_context_clone(const secp256k1_context* ctx) {
15-
< secp256k1_context* ret;
14+
< rustsecp256k1_v0_8_1_context* rustsecp256k1_v0_8_1_context_clone(const rustsecp256k1_v0_8_1_context* ctx) {
15+
< rustsecp256k1_v0_8_1_context* ret;
1616
< size_t prealloc_size;
1717
<
1818
< VERIFY_CHECK(ctx != NULL);
19-
< prealloc_size = secp256k1_context_preallocated_clone_size(ctx);
20-
< ret = (secp256k1_context*)checked_malloc(&ctx->error_callback, prealloc_size);
21-
< ret = secp256k1_context_preallocated_clone(ctx, ret);
19+
< prealloc_size = rustsecp256k1_v0_8_1_context_preallocated_clone_size(ctx);
20+
< ret = (rustsecp256k1_v0_8_1_context*)checked_malloc(&ctx->error_callback, prealloc_size);
21+
< ret = rustsecp256k1_v0_8_1_context_preallocated_clone(ctx, ret);
2222
< return ret;
2323
< }
2424
<
2525
183,189d160
26-
< void secp256k1_context_destroy(secp256k1_context* ctx) {
26+
< void rustsecp256k1_v0_8_1_context_destroy(rustsecp256k1_v0_8_1_context* ctx) {
2727
< if (ctx != NULL) {
28-
< secp256k1_context_preallocated_destroy(ctx);
28+
< rustsecp256k1_v0_8_1_context_preallocated_destroy(ctx);
2929
< free(ctx);
3030
< }
3131
< }
3232
<
3333
206,215d176
3434
< }
3535
<
36-
< secp256k1_scratch_space* secp256k1_scratch_space_create(const secp256k1_context* ctx, size_t max_size) {
36+
< rustsecp256k1_v0_8_1_scratch_space* rustsecp256k1_v0_8_1_scratch_space_create(const rustsecp256k1_v0_8_1_context* ctx, size_t max_size) {
3737
< VERIFY_CHECK(ctx != NULL);
38-
< return secp256k1_scratch_create(&ctx->error_callback, max_size);
38+
< return rustsecp256k1_v0_8_1_scratch_create(&ctx->error_callback, max_size);
3939
< }
4040
<
41-
< void secp256k1_scratch_space_destroy(const secp256k1_context *ctx, secp256k1_scratch_space* scratch) {
41+
< void rustsecp256k1_v0_8_1_scratch_space_destroy(const rustsecp256k1_v0_8_1_context *ctx, rustsecp256k1_v0_8_1_scratch_space* scratch) {
4242
< VERIFY_CHECK(ctx != NULL);
43-
< secp256k1_scratch_destroy(&ctx->error_callback, scratch);
43+
< rustsecp256k1_v0_8_1_scratch_destroy(&ctx->error_callback, scratch);

‎secp256k1-sys/depend/secp256k1.h.patch

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
226,228d225
2-
< SECP256K1_API secp256k1_context* secp256k1_context_create(
2+
< SECP256K1_API rustsecp256k1_v0_8_1_context* rustsecp256k1_v0_8_1_context_create(
33
< unsigned int flags
44
< ) SECP256K1_WARN_UNUSED_RESULT;
55
231,233d227
6-
< SECP256K1_API secp256k1_context* secp256k1_context_clone(
7-
< const secp256k1_context* ctx
6+
< SECP256K1_API rustsecp256k1_v0_8_1_context* rustsecp256k1_v0_8_1_context_clone(
7+
< const rustsecp256k1_v0_8_1_context* ctx
88
< ) SECP256K1_ARG_NONNULL(1) SECP256K1_WARN_UNUSED_RESULT;
99
248,250d241
10-
< SECP256K1_API void secp256k1_context_destroy(
11-
< secp256k1_context* ctx
10+
< SECP256K1_API void rustsecp256k1_v0_8_1_context_destroy(
11+
< rustsecp256k1_v0_8_1_context* ctx
1212
< ) SECP256K1_ARG_NONNULL(1);
1313
327,330d317
14-
< SECP256K1_API SECP256K1_WARN_UNUSED_RESULT secp256k1_scratch_space* secp256k1_scratch_space_create(
15-
< const secp256k1_context* ctx,
14+
< SECP256K1_API SECP256K1_WARN_UNUSED_RESULT rustsecp256k1_v0_8_1_scratch_space* rustsecp256k1_v0_8_1_scratch_space_create(
15+
< const rustsecp256k1_v0_8_1_context* ctx,
1616
< size_t size
1717
< ) SECP256K1_ARG_NONNULL(1);
1818
338,341d324
19-
< SECP256K1_API void secp256k1_scratch_space_destroy(
20-
< const secp256k1_context* ctx,
21-
< secp256k1_scratch_space* scratch
19+
< SECP256K1_API void rustsecp256k1_v0_8_1_scratch_space_destroy(
20+
< const rustsecp256k1_v0_8_1_context* ctx,
21+
< rustsecp256k1_v0_8_1_scratch_space* scratch
2222
< ) SECP256K1_ARG_NONNULL(1);

0 commit comments

Comments
 (0)