From 8e701b75b2c65fc06cd3dc73f3d0c0938138a76f Mon Sep 17 00:00:00 2001 From: Elichai Turkel Date: Thu, 8 Aug 2019 17:21:17 -0400 Subject: [PATCH] Replacing usage of the unsafe `blank` function to the `new` function Signed-off-by: Elichai Turkel --- src/ecdh.rs | 2 +- src/key.rs | 4 ++-- src/lib.rs | 8 ++++---- src/recovery/mod.rs | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ecdh.rs b/src/ecdh.rs index 35de210..6f05422 100644 --- a/src/ecdh.rs +++ b/src/ecdh.rs @@ -30,7 +30,7 @@ impl SharedSecret { #[inline] pub fn new(point: &PublicKey, scalar: &SecretKey) -> SharedSecret { unsafe { - let mut ss = ffi::SharedSecret::blank(); + let mut ss = ffi::SharedSecret::new(); let res = ffi::secp256k1_ecdh( ffi::secp256k1_context_no_precomp, &mut ss, diff --git a/src/key.rs b/src/key.rs index 62d3ab2..85eb92e 100644 --- a/src/key.rs +++ b/src/key.rs @@ -219,7 +219,7 @@ impl PublicKey { pub fn from_secret_key(secp: &Secp256k1, sk: &SecretKey) -> PublicKey { - let mut pk = unsafe { ffi::PublicKey::blank() }; + let mut pk = ffi::PublicKey::new(); unsafe { // We can assume the return value because it's not possible to construct // an invalid `SecretKey` without transmute trickery or something @@ -232,7 +232,7 @@ impl PublicKey { /// Creates a public key directly from a slice #[inline] pub fn from_slice(data: &[u8]) -> Result { - let mut pk = unsafe { ffi::PublicKey::blank() }; + let mut pk = ffi::PublicKey::new(); unsafe { if ffi::secp256k1_ec_pubkey_parse( ffi::secp256k1_context_no_precomp, diff --git a/src/lib.rs b/src/lib.rs index 6454f0e..fd24ab6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -246,7 +246,7 @@ impl Signature { #[inline] /// Converts a DER-encoded byte slice to a signature pub fn from_der(data: &[u8]) -> Result { - let mut ret = unsafe { ffi::Signature::blank() }; + let mut ret = ffi::Signature::new(); unsafe { if ffi::secp256k1_ecdsa_signature_parse_der( @@ -265,7 +265,7 @@ impl Signature { /// Converts a 64-byte compact-encoded byte slice to a signature pub fn from_compact(data: &[u8]) -> Result { - let mut ret = unsafe { ffi::Signature::blank() }; + let mut ret = ffi::Signature::new(); if data.len() != 64 { return Err(Error::InvalidSignature) } @@ -290,7 +290,7 @@ impl Signature { /// support serializing to this "format" pub fn from_der_lax(data: &[u8]) -> Result { unsafe { - let mut ret = ffi::Signature::blank(); + let mut ret = ffi::Signature::new(); if ffi::ecdsa_signature_parse_der_lax( ffi::secp256k1_context_no_precomp, &mut ret, @@ -605,7 +605,7 @@ impl Secp256k1 { pub fn sign(&self, msg: &Message, sk: &key::SecretKey) -> Signature { - let mut ret = unsafe { ffi::Signature::blank() }; + let mut ret = ffi::Signature::new(); unsafe { // We can assume the return value because it's not possible to construct // an invalid signature from a valid `Message` and `SecretKey` diff --git a/src/recovery/mod.rs b/src/recovery/mod.rs index fc88bf5..aecefb1 100644 --- a/src/recovery/mod.rs +++ b/src/recovery/mod.rs @@ -57,7 +57,7 @@ impl RecoverableSignature { /// representation is nonstandard and defined by the libsecp256k1 /// library. pub fn from_compact(data: &[u8], recid: RecoveryId) -> Result { - let mut ret = unsafe { ffi::RecoverableSignature::blank() }; + let mut ret = ffi::RecoverableSignature::new(); unsafe { if data.len() != 64 { @@ -103,7 +103,7 @@ impl RecoverableSignature { /// for verification #[inline] pub fn to_standard(&self) -> Signature { - let mut ret = unsafe { super_ffi::Signature::blank() }; + let mut ret = super_ffi::Signature::new(); unsafe { let err = ffi::secp256k1_ecdsa_recoverable_signature_convert( super_ffi::secp256k1_context_no_precomp, @@ -130,7 +130,7 @@ impl Secp256k1 { pub fn sign_recoverable(&self, msg: &Message, sk: &key::SecretKey) -> RecoverableSignature { - let mut ret = unsafe { ffi::RecoverableSignature::blank() }; + let mut ret = ffi::RecoverableSignature::new(); unsafe { // We can assume the return value because it's not possible to construct // an invalid signature from a valid `Message` and `SecretKey` @@ -157,7 +157,7 @@ impl Secp256k1 { pub fn recover(&self, msg: &Message, sig: &RecoverableSignature) -> Result { - let mut pk = unsafe { super_ffi::PublicKey::blank() }; + let mut pk = super_ffi::PublicKey::new(); unsafe { if ffi::secp256k1_ecdsa_recover(self.ctx, &mut pk,