milksad
/
rust-secp256k1-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

fix incorrect FFI binding for pubkey_combine

This commit is contained in:
Andrew Poelstra 2023-12-18 20:37:28 +00:00
parent 97dade5581
commit 484e5d8d5b
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo-minimal.lock
View File

@ -273,7 +273,7 @@ dependencies = [
[[package]] [[package]]
name = "secp256k1-sys" name = "secp256k1-sys"
version = "0.9.1" version = "0.9.2"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",

2
Cargo-recent.lock
View File

@ -194,7 +194,7 @@ dependencies = [
[[package]] [[package]]
name = "secp256k1-sys" name = "secp256k1-sys"
version = "0.9.1" version = "0.9.2"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",

4
secp256k1-sys/CHANGELOG.md
View File

@ -1,3 +1,7 @@
# 0.9.2 - 2023-12-18
* Fix incorrect FFI binding for `secp256k1_pubkey_combine`
# 0.9.1 - 2023-12-07 # 0.9.1 - 2023-12-07
* Patch out any instances of printf in upstream [#663](https://github.com/rust-bitcoin/rust-secp256k1/pull/663) * Patch out any instances of printf in upstream [#663](https://github.com/rust-bitcoin/rust-secp256k1/pull/663)

2
secp256k1-sys/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "secp256k1-sys" name = "secp256k1-sys"
version = "0.9.1" version = "0.9.2"
authors = [ "Dawid Ciężarkiewicz <dpc@ucore.info>", authors = [ "Dawid Ciężarkiewicz <dpc@ucore.info>",
"Andrew Poelstra <apoelstra@wpsoftware.net>", "Andrew Poelstra <apoelstra@wpsoftware.net>",
"Steven Roose <steven@stevenroose.org>" ] "Steven Roose <steven@stevenroose.org>" ]

4
secp256k1-sys/src/lib.rs
View File

@ -724,7 +724,7 @@ extern "C" {
pub fn secp256k1_ec_pubkey_combine(cx: *const Context, pub fn secp256k1_ec_pubkey_combine(cx: *const Context,
out: *mut PublicKey, out: *mut PublicKey,
ins: *const *const PublicKey, ins: *const *const PublicKey,
n: c_int) n: size_t)
-> c_int; -> c_int;
#[cfg_attr(not(rust_secp_no_symbol_renaming), link_name = "rustsecp256k1_v0_9_1_ecdh")] #[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, pub unsafe fn secp256k1_ec_pubkey_combine(cx: *const Context,
out: *mut PublicKey, out: *mut PublicKey,
ins: *const *const PublicKey, ins: *const *const PublicKey,
n: c_int) n: size_t)
-> c_int { -> c_int {
check_context_flags(cx, 0); check_context_flags(cx, 0);
assert!(n >= 1); assert!(n >= 1);

2
src/key.rs
View File

@ -676,7 +676,7 @@ impl PublicKey {
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
&mut ret, &mut ret,
ptrs.as_c_ptr(), ptrs.as_c_ptr(),
keys.len() as i32, keys.len(),
) == 1 ) == 1
{ {
Ok(PublicKey(ret)) Ok(PublicKey(ret))