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

Add assert for the response of ffi negate interface 

The interfaces for negate should always returns 1 as mentioned secp256k1.h L574, L563.
But in the future it might return 0 if the seckey or pubkey is invalid, but our type system doesn't allow that to ever happen.
This commit is contained in:
Kohei Taniguchi 2020-06-10 09:59:55 +09:00
parent 1742973a1f
commit 02ed0616e4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/key.rs
View File

@ -154,10 +154,11 @@ impl SecretKey {
&mut self &mut self
) { ) {
unsafe { unsafe {
ffi::secp256k1_ec_privkey_negate( let res = ffi::secp256k1_ec_privkey_negate(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
self.as_mut_c_ptr() self.as_mut_c_ptr()
); );
debug_assert_eq!(res, 1);
} }
} }
@ -310,13 +311,10 @@ impl PublicKey {
pub fn negate_assign<C: Verification>( pub fn negate_assign<C: Verification>(
&mut self, &mut self,
secp: &Secp256k1<C> secp: &Secp256k1<C>
) -> Result<(), Error> { ) {
unsafe { unsafe {
if ffi::secp256k1_ec_pubkey_negate(secp.ctx, &mut self.0 as *mut _) == 1 { let res = ffi::secp256k1_ec_pubkey_negate(secp.ctx, &mut self.0 as *mut _);
Ok(()) debug_assert_eq!(res, 1);
} else {
Err(Error::InvalidPublicKey)
}
} }
} }
@ -792,11 +790,11 @@ mod test {
assert_eq!(PublicKey::from_secret_key(&s, &sk), pk); assert_eq!(PublicKey::from_secret_key(&s, &sk), pk);
sk.negate_assign(); sk.negate_assign();
assert!(pk.negate_assign(&s).is_ok()); pk.negate_assign(&s);
assert_ne!(original_sk, sk); assert_ne!(original_sk, sk);
assert_ne!(original_pk, pk); assert_ne!(original_pk, pk);
sk.negate_assign(); sk.negate_assign();
assert!(pk.negate_assign(&s).is_ok()); pk.negate_assign(&s);
assert_eq!(original_sk, sk); assert_eq!(original_sk, sk);
assert_eq!(original_pk, pk); assert_eq!(original_pk, pk);
assert_eq!(PublicKey::from_secret_key(&s, &sk), pk); assert_eq!(PublicKey::from_secret_key(&s, &sk), pk);