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

Change MessageSignatureError to secp256k1::Error 

`from_byte_array` cannot error due to InvalidLength so the returned
MessageSignatureError has been changed to return a secp256k1::Error,
which is the only error type returned by the function.
This commit is contained in:
Jamil Lambert, PhD 2024-09-06 12:49:11 +01:00
parent a20d0bc4eb
commit c00afe8d52
No known key found for this signature in database
GPG Key ID: 54DC29234AB5D2C0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitcoin/src/sign_message.rs
View File

@ -111,12 +111,10 @@ mod message_signing {
/// Creates a `MessageSignature` from a fixed-length array. /// Creates a `MessageSignature` from a fixed-length array.
pub fn from_byte_array( pub fn from_byte_array(
bytes: &[u8; 65], bytes: &[u8; 65],
) -> Result<MessageSignature, MessageSignatureError> { ) -> Result<MessageSignature, secp256k1::Error> {
// We just check this here so we can safely subtract further. // We just check this here so we can safely subtract further.
if bytes[0] < 27 { if bytes[0] < 27 {
return Err(MessageSignatureError::InvalidEncoding( return Err(secp256k1::Error::InvalidRecoveryId);
secp256k1::Error::InvalidRecoveryId,
));
}; };
let recid = RecoveryId::from_i32(((bytes[0] - 27) & 0x03) as i32)?; let recid = RecoveryId::from_i32(((bytes[0] - 27) & 0x03) as i32)?;
Ok(MessageSignature { Ok(MessageSignature {
@ -130,7 +128,7 @@ mod message_signing {
pub fn from_slice(bytes: &[u8]) -> Result<MessageSignature, MessageSignatureError> { pub fn from_slice(bytes: &[u8]) -> Result<MessageSignature, MessageSignatureError> {
let byte_array: [u8; 65] = let byte_array: [u8; 65] =
bytes.try_into().map_err(|_| MessageSignatureError::InvalidLength)?; bytes.try_into().map_err(|_| MessageSignatureError::InvalidLength)?;
Self::from_byte_array(&byte_array) Self::from_byte_array(&byte_array).map_err(MessageSignatureError::from)
} }
/// Attempt to recover a public key from the signature and the signed message. /// Attempt to recover a public key from the signature and the signed message.
@ -184,7 +182,7 @@ mod message_signing {
BASE64_STANDARD BASE64_STANDARD
.decode_slice_unchecked(s, &mut byte_array) .decode_slice_unchecked(s, &mut byte_array)
.map_err(|_| MessageSignatureError::InvalidBase64)?; .map_err(|_| MessageSignatureError::InvalidBase64)?;
MessageSignature::from_byte_array(&byte_array) MessageSignature::from_byte_array(&byte_array).map_err(MessageSignatureError::from)
} }
/// Convert to base64 encoding. /// Convert to base64 encoding.