@@ -382,7 +382,7 @@ impl From<(libsecp256k1::Signature, libsecp256k1::RecoveryId)> for Signature {
382
382
impl < ' a > TryFrom < & ' a Signature > for ( libsecp256k1:: Signature , libsecp256k1:: RecoveryId ) {
383
383
type Error = ( ) ;
384
384
fn try_from ( x : & ' a Signature ) -> Result < ( libsecp256k1:: Signature , libsecp256k1:: RecoveryId ) , Self :: Error > {
385
- parse_signature ( & x. 0 ) . map_err ( |_| ( ) )
385
+ parse_signature_standard ( & x. 0 ) . map_err ( |_| ( ) )
386
386
}
387
387
}
388
388
@@ -508,7 +508,7 @@ impl TraitPair for Pair {
508
508
fn verify_weak < P : AsRef < [ u8 ] > , M : AsRef < [ u8 ] > > ( sig : & [ u8 ] , message : M , pubkey : P ) -> bool {
509
509
let message = libsecp256k1:: Message :: parse ( & blake2_256 ( message. as_ref ( ) ) ) ;
510
510
if sig. len ( ) != 65 { return false }
511
- let ( sig, ri) = match parse_signature ( & sig) {
511
+ let ( sig, ri) = match parse_signature_standard ( & sig) {
512
512
Ok ( sigri) => sigri,
513
513
_ => return false ,
514
514
} ;
@@ -569,7 +569,7 @@ impl Pair {
569
569
/// Parses Signature using parse_overflowing_slice
570
570
pub fn verify_deprecated < M : AsRef < [ u8 ] > > ( sig : & Signature , message : M , pubkey : & Public ) -> bool {
571
571
let message = libsecp256k1:: Message :: parse ( & blake2_256 ( message. as_ref ( ) ) ) ;
572
- let ( sig, ri) = match parse_signature_deprecated ( & sig. 0 ) {
572
+ let ( sig, ri) = match parse_signature_overflowing ( & sig. 0 ) {
573
573
Ok ( sigri) => sigri,
574
574
_ => return false
575
575
} ;
@@ -581,21 +581,21 @@ impl Pair {
581
581
}
582
582
583
583
#[ cfg( feature = "full_crypto" ) ]
584
- fn parse_signature (
585
- x : & [ u8 ] ,
584
+ fn parse_signature_standard (
585
+ x : & [ u8 ] ,
586
586
) -> Result < ( libsecp256k1:: Signature , libsecp256k1:: RecoveryId ) , libsecp256k1:: Error > {
587
- let sig = libsecp256k1:: Signature :: parse_standard_slice ( & x[ 0 ..64 ] ) ?;
588
- let ri = libsecp256k1:: RecoveryId :: parse ( x[ 64 ] ) ?;
589
- Ok ( ( sig, ri) )
587
+ let sig = libsecp256k1:: Signature :: parse_standard_slice ( & x[ 0 ..64 ] ) ?;
588
+ let ri = libsecp256k1:: RecoveryId :: parse ( x[ 64 ] ) ?;
589
+ Ok ( ( sig, ri) )
590
590
}
591
591
592
592
#[ cfg( feature = "full_crypto" ) ]
593
- fn parse_signature_deprecated (
594
- x : & [ u8 ] ,
593
+ fn parse_signature_overflowing (
594
+ x : & [ u8 ] ,
595
595
) -> Result < ( libsecp256k1:: Signature , libsecp256k1:: RecoveryId ) , libsecp256k1:: Error > {
596
- let sig = libsecp256k1:: Signature :: parse_overflowing_slice ( & x[ 0 ..64 ] ) ?;
597
- let ri = libsecp256k1:: RecoveryId :: parse ( x[ 64 ] ) ?;
598
- Ok ( ( sig, ri) )
596
+ let sig = libsecp256k1:: Signature :: parse_overflowing_slice ( & x[ 0 ..64 ] ) ?;
597
+ let ri = libsecp256k1:: RecoveryId :: parse ( x[ 64 ] ) ?;
598
+ Ok ( ( sig, ri) )
599
599
}
600
600
601
601
impl CryptoType for Public {
0 commit comments