From bf53d3e076155b94155ed822a4db8ee8ea9b6960 Mon Sep 17 00:00:00 2001
From: thefireskater <114769322+thefireskater@users.noreply.github.com>
Date: Wed, 14 Jun 2023 21:21:23 -0700
Subject: [PATCH] Prepare header and proof options digest to messages before
 signing

---
 ssi-jws/src/lib.rs |  9 ++++++++-
 ssi-ldp/src/lib.rs | 16 ++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ssi-jws/src/lib.rs b/ssi-jws/src/lib.rs
index 6db6cbc51..6ab6dc92c 100644
--- a/ssi-jws/src/lib.rs
+++ b/ssi-jws/src/lib.rs
@@ -113,7 +113,14 @@ pub fn sign_bytes_v2(
 
     let messages_str = payload.messages.join("");
     let messages_hash = sha256(messages_str.as_bytes());
-    sign_bytes(algorithm, &messages_hash, key)
+    let data = [
+        payload.header.as_bytes(),
+        b".",
+        payload.sigopts_digest.as_slice(),
+        messages_hash.as_slice(),
+    ]
+    .concat();
+    sign_bytes(algorithm, data.as_slice(), key)
 }
 
 pub fn generate_proof_nonce() -> String {
diff --git a/ssi-ldp/src/lib.rs b/ssi-ldp/src/lib.rs
index 0f1014769..e15945a5d 100644
--- a/ssi-ldp/src/lib.rs
+++ b/ssi-ldp/src/lib.rs
@@ -477,7 +477,8 @@ pub async fn generate_bbs_signature_pok(
     let mut proof_without_jws = proof.clone();
     proof_without_jws.jws = None;
     let mut context_loader = ssi_json_ld::ContextLoader::default();
-    let payload = to_jws_payload_v2(document, &proof_without_jws, &mut context_loader).await?;
+    let payload =
+        to_jws_payload_v2(document, &proof_without_jws, &mut context_loader, true).await?;
     let (_header, header_str) = ssi_jws::generate_header(Algorithm::BLS12381G2, &key).unwrap();
 
     let start_index = signature_with_header.find("..").unwrap() + 2; // +2 for ..; todo: switch to ok_or
@@ -660,6 +661,7 @@ async fn to_jws_payload_v2(
     document: &(dyn LinkedDataDocument + Sync),
     proof: &Proof,
     context_loader: &mut ContextLoader,
+    stable_blank_node_labels: bool,
 ) -> Result<JWSPayload, Error> {
     let mut payload = JWSPayload {
         header: String::new(),
@@ -678,7 +680,11 @@ async fn to_jws_payload_v2(
         .await?;
     let doc_normalized =
         urdna2015::normalize(doc_dataset.quads().map(QuadRef::from)).into_nquads_vec();
-    payload.messages = rename_blank_node_labels(&doc_normalized);
+    if stable_blank_node_labels {
+        payload.messages = rename_blank_node_labels(&doc_normalized);
+    } else {
+        payload.messages = doc_normalized;
+    }
 
     /*
     for message in payload.messages.iter() {
@@ -730,7 +736,9 @@ async fn sign_proof_v2(
     algorithm: Algorithm,
     context_loader: &mut ContextLoader,
 ) -> Result<Proof, Error> {
-    let mut jws_payload = to_jws_payload_v2(document, &proof, context_loader).await?;
+    let stable_blank_nodes = matches!(algorithm, Algorithm::BLS12381G2);
+    let mut jws_payload =
+        to_jws_payload_v2(document, &proof, context_loader, stable_blank_nodes).await?;
     let jws = ssi_jws::detached_sign_unencoded_payload_v2(algorithm, &mut jws_payload, key)?;
     proof.jws = Some(jws);
     Ok(proof)
@@ -890,7 +898,7 @@ async fn verify_bbs_proof(
         .as_ref()
         .ok_or(Error::MissingVerificationMethod)?;
     let key = resolve_key(verification_method, resolver).await?;
-    let mut payload = to_jws_payload_v2(document, proof, context_loader).await?;
+    let mut payload = to_jws_payload_v2(document, proof, context_loader, true).await?;
     let (_, header_b64) = ssi_jws::generate_header(algorithm, &key)?;
     payload.header = header_b64;