@@ -33,7 +33,8 @@ ContextBase::~ContextBase() = default;
33
33
void
34
34
ContextBase::add_key (KeyID key_id, KeyUsage usage, input_bytes base_key)
35
35
{
36
- keys.emplace (key_id, KeyAndSalt::from_base_key (suite, key_id, usage, base_key));
36
+ keys.emplace (key_id,
37
+ KeyAndSalt::from_base_key (suite, key_id, usage, base_key));
37
38
}
38
39
39
40
static owned_bytes<KeyAndSalt::max_salt_size>
@@ -95,7 +96,6 @@ ContextBase::unprotect(const Header& header,
95
96
throw invalid_key_usage_error (" Encrypt-only key used for decryption" );
96
97
}
97
98
98
-
99
99
const auto aad = form_aad (header, metadata);
100
100
const auto nonce = form_nonce (header.counter , key_and_salt.salt );
101
101
return open (suite, key_and_salt.key , nonce, plaintext, aad, ciphertext);
@@ -141,7 +141,10 @@ sframe_salt_label(CipherSuite suite, KeyID key_id)
141
141
}
142
142
143
143
KeyAndSalt
144
- KeyAndSalt::from_base_key (CipherSuite suite, KeyID key_id, KeyUsage usage, input_bytes base_key)
144
+ KeyAndSalt::from_base_key (CipherSuite suite,
145
+ KeyID key_id,
146
+ KeyUsage usage,
147
+ input_bytes base_key)
145
148
{
146
149
auto key_size = cipher_key_size (suite);
147
150
auto nonce_size = cipher_nonce_size (suite);
0 commit comments