Skip to content

Commit 4ef5d03

Browse files
committed
Fix the b64 call
1 parent 8667e3b commit 4ef5d03

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/node/local_sealing.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ namespace ccf
152152
std::vector<uint8_t> sealed_secret_raw = files::slurp(ledger_secret_path);
153153
SealedLedgerSecret sealed_ledger_secret = nlohmann::json::parse(
154154
std::string(sealed_secret_raw.begin(), sealed_secret_raw.end()));
155-
SealedLedgerSecretAAD aad = nlohmann::json::parse(sealed_ledger_secret.aad_text);
155+
SealedLedgerSecretAAD aad =
156+
nlohmann::json::parse(sealed_ledger_secret.aad_text);
156157

157158
CCF_ASSERT_FMT(
158159
aad.version == expected_version,
@@ -163,11 +164,12 @@ namespace ccf
163164
// make_derived_key will fail if the CPU's TCB version is rolled back
164165
// below aad.tcb_version
165166
auto sealing_key = ccf::pal::snp::make_derived_key(aad.tcb_version);
167+
std::vector<uint8_t> buf_aad(
168+
sealed_ledger_secret.aad_text.begin(),
169+
sealed_ledger_secret.aad_text.end());
166170

167171
auto buf_plaintext = aes_gcm_unsealing(
168-
sealing_key->get_raw(),
169-
sealed_ledger_secret.ciphertext,
170-
sealed_ledger_secret.aad_text);
172+
sealing_key->get_raw(), sealed_ledger_secret.ciphertext, buf_aad);
171173

172174
LedgerSecret unsealed_ledger_secret = nlohmann::json::parse(
173175
std::string(buf_plaintext.begin(), buf_plaintext.end()));

tests/e2e_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ def run(self, src_dir, dst_dir):
12481248
"xor_ciphertext",
12491249
lambda s: {
12501250
v: {
1251-
"ciphertext": base64.encode(bytes([b ^ 0xFF for b in base64.decode(s[v]["ciphertext"])])),
1251+
"ciphertext": base64.b64encode(bytes([b ^ 0xFF for b in base64.b64decode(s[v]["ciphertext"])])),
12521252
"aad_text": s[v]["aad_text"],
12531253
}
12541254
for v in s.keys()

0 commit comments

Comments
 (0)