fix incorrect FFI binding for pubkey_combine

apoelstra · apoelstra · commit 484e5d8d5b9d · 2023-12-18T21:28:27.000Z
diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock
@@ -273,7 +273,7 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.9.1"
+version = "0.9.2"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo-recent.lock b/Cargo-recent.lock
@@ -194,7 +194,7 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.9.1"
+version = "0.9.2"
 dependencies = [
  "cc",
  "libc",
diff --git a/secp256k1-sys/CHANGELOG.md b/secp256k1-sys/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.9.2 - 2023-12-18
+
+* Fix incorrect FFI binding for `secp256k1_pubkey_combine`
+
 # 0.9.1 - 2023-12-07
 
 * Patch out any instances of printf in upstream [#663](https://github.com/rust-bitcoin/rust-secp256k1/pull/663)
diff --git a/secp256k1-sys/Cargo.toml b/secp256k1-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "secp256k1-sys"
-version = "0.9.1"
+version = "0.9.2"
 authors = [ "Dawid Ciężarkiewicz <dpc@ucore.info>",
             "Andrew Poelstra <apoelstra@wpsoftware.net>",
             "Steven Roose <steven@stevenroose.org>" ]
diff --git a/secp256k1-sys/src/lib.rs b/secp256k1-sys/src/lib.rs
@@ -724,7 +724,7 @@ extern "C" {
     pub fn secp256k1_ec_pubkey_combine(cx: *const Context,
                                        out: *mut PublicKey,
                                        ins: *const *const PublicKey,
-                                       n: c_int)
+                                       n: size_t)
                                        -> c_int;
 
     #[cfg_attr(not(rust_secp_no_symbol_renaming), link_name = "rustsecp256k1_v0_9_1_ecdh")]
@@ -1306,7 +1306,7 @@ mod fuzz_dummy {
     pub unsafe fn secp256k1_ec_pubkey_combine(cx: *const Context,
                                               out: *mut PublicKey,
                                               ins: *const *const PublicKey,
-                                              n: c_int)
+                                              n: size_t)
                                               -> c_int {
         check_context_flags(cx, 0);
         assert!(n >= 1);
diff --git a/src/key.rs b/src/key.rs
@@ -676,7 +676,7 @@ impl PublicKey {
                 ffi::secp256k1_context_no_precomp,
                 &mut ret,
                 ptrs.as_c_ptr(),
-                keys.len() as i32,
+                keys.len(),
             ) == 1
             {
                 Ok(PublicKey(ret))

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 [package]
 name = "secp256k1-sys"
 -version = "0.9.1"
 +version = "0.9.2"
 authors = [ "Dawid Ciężarkiewicz <[email protected]>",
             "Andrew Poelstra <[email protected]>",
             "Steven Roose <[email protected]>" ]
Original file line number	Diff line number	Diff line change
`@@ -676,7 +676,7 @@ impl PublicKey {`
`676`	`676`	`ffi::secp256k1_context_no_precomp,`
`677`	`677`	`&mut ret,`
`678`	`678`	`ptrs.as_c_ptr(),`
`679`		`- keys.len() as i32,`
	`679`	`+ keys.len(),`
`680`	`680`	`) == 1`
`681`	`681`	`{`
`682`	`682`	`Ok(PublicKey(ret))`