Replacing usage of the unsafe `blank` function to the `new` function

Signed-off-by: Elichai Turkel <elichai.turkel@gmail.com>
This commit is contained in:
Elichai Turkel 2019-08-08 17:21:17 -04:00
parent 389e1e2449
commit 8e701b75b2
No known key found for this signature in database
GPG Key ID: 9383CDE9E8E66A7F
4 changed files with 11 additions and 11 deletions

View File

@ -30,7 +30,7 @@ impl SharedSecret {
#[inline] #[inline]
pub fn new(point: &PublicKey, scalar: &SecretKey) -> SharedSecret { pub fn new(point: &PublicKey, scalar: &SecretKey) -> SharedSecret {
unsafe { unsafe {
let mut ss = ffi::SharedSecret::blank(); let mut ss = ffi::SharedSecret::new();
let res = ffi::secp256k1_ecdh( let res = ffi::secp256k1_ecdh(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
&mut ss, &mut ss,

View File

@ -219,7 +219,7 @@ impl PublicKey {
pub fn from_secret_key<C: Signing>(secp: &Secp256k1<C>, pub fn from_secret_key<C: Signing>(secp: &Secp256k1<C>,
sk: &SecretKey) sk: &SecretKey)
-> PublicKey { -> PublicKey {
let mut pk = unsafe { ffi::PublicKey::blank() }; let mut pk = ffi::PublicKey::new();
unsafe { unsafe {
// We can assume the return value because it's not possible to construct // We can assume the return value because it's not possible to construct
// an invalid `SecretKey` without transmute trickery or something // an invalid `SecretKey` without transmute trickery or something
@ -232,7 +232,7 @@ impl PublicKey {
/// Creates a public key directly from a slice /// Creates a public key directly from a slice
#[inline] #[inline]
pub fn from_slice(data: &[u8]) -> Result<PublicKey, Error> { pub fn from_slice(data: &[u8]) -> Result<PublicKey, Error> {
let mut pk = unsafe { ffi::PublicKey::blank() }; let mut pk = ffi::PublicKey::new();
unsafe { unsafe {
if ffi::secp256k1_ec_pubkey_parse( if ffi::secp256k1_ec_pubkey_parse(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,

View File

@ -246,7 +246,7 @@ impl Signature {
#[inline] #[inline]
/// Converts a DER-encoded byte slice to a signature /// Converts a DER-encoded byte slice to a signature
pub fn from_der(data: &[u8]) -> Result<Signature, Error> { pub fn from_der(data: &[u8]) -> Result<Signature, Error> {
let mut ret = unsafe { ffi::Signature::blank() }; let mut ret = ffi::Signature::new();
unsafe { unsafe {
if ffi::secp256k1_ecdsa_signature_parse_der( if ffi::secp256k1_ecdsa_signature_parse_der(
@ -265,7 +265,7 @@ impl Signature {
/// Converts a 64-byte compact-encoded byte slice to a signature /// Converts a 64-byte compact-encoded byte slice to a signature
pub fn from_compact(data: &[u8]) -> Result<Signature, Error> { pub fn from_compact(data: &[u8]) -> Result<Signature, Error> {
let mut ret = unsafe { ffi::Signature::blank() }; let mut ret = ffi::Signature::new();
if data.len() != 64 { if data.len() != 64 {
return Err(Error::InvalidSignature) return Err(Error::InvalidSignature)
} }
@ -290,7 +290,7 @@ impl Signature {
/// support serializing to this "format" /// support serializing to this "format"
pub fn from_der_lax(data: &[u8]) -> Result<Signature, Error> { pub fn from_der_lax(data: &[u8]) -> Result<Signature, Error> {
unsafe { unsafe {
let mut ret = ffi::Signature::blank(); let mut ret = ffi::Signature::new();
if ffi::ecdsa_signature_parse_der_lax( if ffi::ecdsa_signature_parse_der_lax(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
&mut ret, &mut ret,
@ -605,7 +605,7 @@ impl<C: Signing> Secp256k1<C> {
pub fn sign(&self, msg: &Message, sk: &key::SecretKey) pub fn sign(&self, msg: &Message, sk: &key::SecretKey)
-> Signature { -> Signature {
let mut ret = unsafe { ffi::Signature::blank() }; let mut ret = ffi::Signature::new();
unsafe { unsafe {
// We can assume the return value because it's not possible to construct // We can assume the return value because it's not possible to construct
// an invalid signature from a valid `Message` and `SecretKey` // an invalid signature from a valid `Message` and `SecretKey`

View File

@ -57,7 +57,7 @@ impl RecoverableSignature {
/// representation is nonstandard and defined by the libsecp256k1 /// representation is nonstandard and defined by the libsecp256k1
/// library. /// library.
pub fn from_compact(data: &[u8], recid: RecoveryId) -> Result<RecoverableSignature, Error> { pub fn from_compact(data: &[u8], recid: RecoveryId) -> Result<RecoverableSignature, Error> {
let mut ret = unsafe { ffi::RecoverableSignature::blank() }; let mut ret = ffi::RecoverableSignature::new();
unsafe { unsafe {
if data.len() != 64 { if data.len() != 64 {
@ -103,7 +103,7 @@ impl RecoverableSignature {
/// for verification /// for verification
#[inline] #[inline]
pub fn to_standard(&self) -> Signature { pub fn to_standard(&self) -> Signature {
let mut ret = unsafe { super_ffi::Signature::blank() }; let mut ret = super_ffi::Signature::new();
unsafe { unsafe {
let err = ffi::secp256k1_ecdsa_recoverable_signature_convert( let err = ffi::secp256k1_ecdsa_recoverable_signature_convert(
super_ffi::secp256k1_context_no_precomp, super_ffi::secp256k1_context_no_precomp,
@ -130,7 +130,7 @@ impl<C: Signing> Secp256k1<C> {
pub fn sign_recoverable(&self, msg: &Message, sk: &key::SecretKey) pub fn sign_recoverable(&self, msg: &Message, sk: &key::SecretKey)
-> RecoverableSignature { -> RecoverableSignature {
let mut ret = unsafe { ffi::RecoverableSignature::blank() }; let mut ret = ffi::RecoverableSignature::new();
unsafe { unsafe {
// We can assume the return value because it's not possible to construct // We can assume the return value because it's not possible to construct
// an invalid signature from a valid `Message` and `SecretKey` // an invalid signature from a valid `Message` and `SecretKey`
@ -157,7 +157,7 @@ impl<C: Verification> Secp256k1<C> {
pub fn recover(&self, msg: &Message, sig: &RecoverableSignature) pub fn recover(&self, msg: &Message, sig: &RecoverableSignature)
-> Result<key::PublicKey, Error> { -> Result<key::PublicKey, Error> {
let mut pk = unsafe { super_ffi::PublicKey::blank() }; let mut pk = super_ffi::PublicKey::new();
unsafe { unsafe {
if ffi::secp256k1_ecdsa_recover(self.ctx, &mut pk, if ffi::secp256k1_ecdsa_recover(self.ctx, &mut pk,