Skip to content

Commit 7733b97

Browse files
author
Amanjeev Sethi
committed
Hashes revocation review: base64-encode instead of serde roundtrip.
Reviewed-by: Pietro Albini <[email protected]> Ticket: https://ferroussystems.clickup.com/t/86947z6fp
1 parent 0065677 commit 7733b97

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

crates/criticaltrust/src/errors.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,4 @@ pub enum Error {
3838
aws_smithy_runtime_api::client::orchestrator::HttpResponse,
3939
>,
4040
),
41-
#[error("failed verification while converting signature to string")]
42-
SignatureConversionFailure,
4341
}

crates/criticaltrust/src/keys/public.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use crate::manifests::RevocationInfo;
55
use crate::sha256::hash_sha256;
66
use crate::signatures::{PublicKeysRepository, Signable, SignedPayload};
77
use crate::Error;
8+
use base64::Engine;
89
use serde::{Deserialize, Serialize};
910
use time::OffsetDateTime;
1011

@@ -51,13 +52,11 @@ impl PublicKey {
5152
return Err(Error::VerificationFailed);
5253
}
5354

54-
let signature_as_string = match serde_json::to_string(signature) {
55-
Ok(sig) => sig,
56-
Err(_) => return Err(Error::SignatureConversionFailure),
57-
};
55+
let based_signature =
56+
base64::engine::general_purpose::STANDARD.encode(signature.as_bytes());
5857
if verified_revoked_content
5958
.revoked_content_sha256
60-
.contains(&signature_as_string)
59+
.contains(&based_signature)
6160
{
6261
return Err(Error::VerificationFailed);
6362
}

0 commit comments

Comments
 (0)