Skip to content

Fix BBS derived proof message ordering #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lcy1317 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix BBS derived proof message ordering #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions crates/claims/crates/data-integrity/suites/src/suites/w3c/bbs_2023/derive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use ssi_di_sd_primitives::{
HmacShaAnyKey, JsonPointerBuf,
};
use ssi_json_ld::{Expandable, ExpandedDocument, JsonLdNodeObject};
use ssi_rdf::LexicalInterpretation;
use ssi_rdf::{IntoNQuads, LexicalInterpretation};
use ssi_verification_methods::{
multikey::{self, DecodedMultikey},
Multikey,
Expand Down Expand Up @@ -212,28 +212,26 @@ where
let mandatory_group = canonical.groups.get(&Group::Mandatory).unwrap();
let selective_group = canonical.groups.get(&Group::Selective).unwrap();

let mandatory_match = &mandatory_group.matching;
let combined_match = &combined_group.matching;
let combined_indexes: Vec<_> = combined_match.keys().copied().collect();
let mut mandatory_indexes = Vec::with_capacity(mandatory_match.len());
for i in mandatory_match.keys() {
let offset = combined_indexes.binary_search(i).unwrap();
let combined_lines = combined_group.matching.values().into_nquads_lines();
let mandatory_lines = mandatory_group.matching.values().into_nquads_lines();
let mut mandatory_indexes = Vec::with_capacity(mandatory_lines.len());
for line in mandatory_lines {
let offset = combined_lines.binary_search(&line).unwrap();
mandatory_indexes.push(offset);
}

let selective_match = &selective_group.matching;
let mandatory_non_match = &mandatory_group.non_matching;
let non_mandatory_indexes: Vec<_> = mandatory_non_match.keys().copied().collect();
let mut selective_indexes = Vec::with_capacity(mandatory_non_match.len());
for i in selective_match.keys() {
if let Ok(offset) = non_mandatory_indexes.binary_search(i) {
let bbs_message_lines = mandatory_group.non_matching.values().into_nquads_lines();
let selective_lines = selective_group.matching.values().into_nquads_lines();
let mut selective_indexes = Vec::with_capacity(selective_lines.len());
for line in selective_lines {
if let Ok(offset) = bbs_message_lines.binary_search(&line) {
selective_indexes.push(offset);
}
}

let bbs_messages: Vec<_> = mandatory_non_match
.values()
.map(|quad| format!("{quad} .\n").into_bytes())
let bbs_messages: Vec<_> = bbs_message_lines
.into_iter()
.map(String::into_bytes)
.collect();

let DecodedMultikey::Bls12_381(pk) = verification_method.public_key.decode()? else {
Expand Down