Skip to content

Remove unused Hermes blob validation helper #1185

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

Merged
binarybaron merged 1 commit into from
Aug 2, 2026
Merged

Remove unused Hermes blob validation helper #1185

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
33 changes: 6 additions & 27 deletions monero-wallet-ng/src/hermes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,25 +224,6 @@ impl HermesBlob {
Ok(HermesMessage(self.0[3..3 + length].to_vec()))
}

pub fn validate(&self) -> bool {
// The marker must be present
if !self.has_marker() {
return false;
}

// The specified message length must not be greater than the maximum allowed message size
if self.message_length() > MAX_HERMES_MESSAGE_SIZE as u16 {
return false;
}

// The entire blob must be exactly HERMES_BLOB_LENGTH long
if self.0.len() != HERMES_BLOB_LENGTH {
return false;
}

return true;
}

pub fn encrypt(
self,
private_view_key: Zeroizing<Scalar>,
Expand Down Expand Up @@ -317,8 +298,7 @@ mod tests {
assert_eq!(decrypted.message_length(), original_data.len() as u16);
// Check the marker is present
assert!(decrypted.has_marker());
// Check the blob validates
assert!(decrypted.validate());
assert_eq!(decrypted.message().unwrap().as_bytes(), original_data);
}

#[test]
Expand All @@ -332,8 +312,7 @@ mod tests {
let encrypted = blob.encrypt(encrypt_key, nonce);
let decrypted = encrypted.decrypt(decrypt_key).unwrap();

// Wrong key should produce invalid blob (marker won't match)
assert!(!decrypted.validate());
assert_eq!(decrypted.message(), Err(HermesError::MissingMarker));
}

#[test]
Expand All @@ -353,14 +332,14 @@ mod tests {
}

#[test]
fn blob_validation_checks_marker() {
fn message_rejects_blob_without_marker() {
let mut blob_data = vec![0u8; HERMES_BLOB_LENGTH];
blob_data[0] = 255; // Wrong marker
blob_data[1] = 1; // Valid length
blob_data[2] = 0;

let blob = HermesBlob::new(blob_data).unwrap();
assert!(!blob.validate());
assert_eq!(blob.message(), Err(HermesError::MissingMarker));
}

#[test]
Expand Down Expand Up @@ -399,13 +378,13 @@ mod tests {
}

#[test]
fn blob_validation_checks_message_length() {
fn message_rejects_blob_with_invalid_message_length() {
let mut blob_data = vec![0u8; HERMES_BLOB_LENGTH];
blob_data[0] = HERMES_DATA_MARKER;
blob_data[1] = 1; // Length = 257 (> MAX_HERMES_MESSAGE_SIZE)
blob_data[2] = 1;

let blob = HermesBlob::new(blob_data).unwrap();
assert!(!blob.validate());
assert_eq!(blob.message(), Err(HermesError::InvalidMessageLength));
}
}
Loading