Skip to content

Commit 20c6e35

Browse files
committed
Use TaggedHash in merkle::verify_signature
An earlier commit introduced TaggedHash for use in sign_message. For consistency, use it in verify_signature, too.
1 parent 3da1f90 commit 20c6e35

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

lightning/src/offers/invoice.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,9 @@ impl TryFrom<ParsedMessage<FullInvoiceTlvStream>> for Invoice {
870870
None => return Err(ParseError::InvalidSemantics(SemanticError::MissingSignature)),
871871
Some(signature) => signature,
872872
};
873+
let message = TaggedHash::new(SIGNATURE_TAG, &bytes);
873874
let pubkey = contents.fields().signing_pubkey;
874-
merkle::verify_signature(&signature, SIGNATURE_TAG, &bytes, pubkey)?;
875+
merkle::verify_signature(&signature, message, pubkey)?;
875876

876877
Ok(Invoice { bytes, contents, signature })
877878
}
@@ -1028,11 +1029,9 @@ mod tests {
10281029
assert_eq!(invoice.fallbacks(), vec![]);
10291030
assert_eq!(invoice.features(), &Bolt12InvoiceFeatures::empty());
10301031
assert_eq!(invoice.signing_pubkey(), recipient_pubkey());
1031-
assert!(
1032-
merkle::verify_signature(
1033-
&invoice.signature, SIGNATURE_TAG, &invoice.bytes, recipient_pubkey()
1034-
).is_ok()
1035-
);
1032+
1033+
let message = TaggedHash::new(SIGNATURE_TAG, &invoice.bytes);
1034+
assert!(merkle::verify_signature(&invoice.signature, message, recipient_pubkey()).is_ok());
10361035

10371036
let digest = Message::from_slice(&invoice.signable_hash()).unwrap();
10381037
let pubkey = recipient_pubkey().into();
@@ -1111,11 +1110,9 @@ mod tests {
11111110
assert_eq!(invoice.fallbacks(), vec![]);
11121111
assert_eq!(invoice.features(), &Bolt12InvoiceFeatures::empty());
11131112
assert_eq!(invoice.signing_pubkey(), recipient_pubkey());
1114-
assert!(
1115-
merkle::verify_signature(
1116-
&invoice.signature, SIGNATURE_TAG, &invoice.bytes, recipient_pubkey()
1117-
).is_ok()
1118-
);
1113+
1114+
let message = TaggedHash::new(SIGNATURE_TAG, &invoice.bytes);
1115+
assert!(merkle::verify_signature(&invoice.signature, message, recipient_pubkey()).is_ok());
11191116

11201117
assert_eq!(
11211118
invoice.as_tlv_stream(),

lightning/src/offers/invoice_request.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,8 @@ impl TryFrom<Vec<u8>> for InvoiceRequest {
729729
None => return Err(ParseError::InvalidSemantics(SemanticError::MissingSignature)),
730730
Some(signature) => signature,
731731
};
732-
merkle::verify_signature(&signature, SIGNATURE_TAG, &bytes, contents.payer_id)?;
732+
let message = TaggedHash::new(SIGNATURE_TAG, &bytes);
733+
merkle::verify_signature(&signature, message, contents.payer_id)?;
733734

734735
Ok(InvoiceRequest { bytes, contents, signature })
735736
}
@@ -822,10 +823,10 @@ mod tests {
822823
assert_eq!(invoice_request.quantity(), None);
823824
assert_eq!(invoice_request.payer_id(), payer_pubkey());
824825
assert_eq!(invoice_request.payer_note(), None);
826+
827+
let message = TaggedHash::new(SIGNATURE_TAG, &invoice_request.bytes);
825828
assert!(
826-
merkle::verify_signature(
827-
&invoice_request.signature, SIGNATURE_TAG, &invoice_request.bytes, payer_pubkey()
828-
).is_ok()
829+
merkle::verify_signature(&invoice_request.signature, message, payer_pubkey()).is_ok()
829830
);
830831

831832
assert_eq!(

lightning/src/offers/merkle.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ pub(super) fn sign_message<F: SignFunction<E>, E>(
9090
Ok(signature)
9191
}
9292

93-
/// Verifies the signature with a pubkey over the given bytes using a tagged hash as the message
93+
/// Verifies the signature with a pubkey over the given message using a tagged hash as the message
9494
/// digest.
9595
///
96-
/// Panics if `bytes` is not a well-formed TLV stream containing at least one TLV record.
96+
/// Panics if `message` is not a well-formed TLV stream containing at least one TLV record.
9797
pub(super) fn verify_signature(
98-
signature: &Signature, tag: &str, bytes: &[u8], pubkey: PublicKey,
98+
signature: &Signature, message: TaggedHash, pubkey: PublicKey,
9999
) -> Result<(), secp256k1::Error> {
100-
let digest = message_digest(tag, bytes);
100+
let digest = message.to_digest();
101101
let pubkey = pubkey.into();
102102
let secp_ctx = Secp256k1::verification_only();
103103
secp_ctx.verify_schnorr(signature, &digest, &pubkey)

0 commit comments

Comments
 (0)