commit 78b35f84ab4307f0e5f33708fb3ca89c91c3775a
author Alice Wang <aliceywang@google.com> Fri Oct 06 11:57:35 2023 +0000
committer Alice Wang <aliceywang@google.com> Fri Oct 06 11:57:35 2023 +0000
tree 3e7acc9c913bb3f241dc540583b02df569799618
parent 8b8e6e642eb5d4e277ae9911f91dd5f842479cd7

[refactoring] Rename AeadCtx to AeadContext to enhance readability

Test: atest libservice_vm_requests.test
Change-Id: I8669bae45c38bf0449ff94d23a881e09a1010490

service_vm/requests/src/keyblob.rs

diff --git a/service_vm/requests/src/keyblob.rs b/service_vm/requests/src/keyblob.rs
index 5558836..a714edd 100644
--- a/service_vm/requests/src/keyblob.rs
+++ b/service_vm/requests/src/keyblob.rs
@@ -17,7 +17,7 @@
 use crate::cbor;
 use alloc::vec;
 use alloc::vec::Vec;
-use bssl_avf::{hkdf, rand_bytes, Aead, AeadCtx, Digester, AES_GCM_NONCE_LENGTH};
+use bssl_avf::{hkdf, rand_bytes, Aead, AeadContext, Digester, AES_GCM_NONCE_LENGTH};
 use core::result;
 use serde::{Deserialize, Serialize};
 use service_vm_comm::RequestProcessingError;
@@ -89,7 +89,7 @@
         let kek = hkdf::<32>(kek_secret, &kek_salt, KEK_INFO, Digester::sha512())?;
 
         let tag_len = None;
-        let aead_ctx = AeadCtx::new(Aead::aes_256_gcm(), kek.as_slice(), tag_len)?;
+        let aead_ctx = AeadContext::new(Aead::aes_256_gcm(), kek.as_slice(), tag_len)?;
         let mut out = vec![0u8; private_key.len() + aead_ctx.aead().max_overhead()];
         let ciphertext = aead_ctx.seal(private_key, PRIVATE_KEY_NONCE, PRIVATE_KEY_AD, &mut out)?;
 
@@ -101,7 +101,7 @@
         let kek = hkdf::<32>(kek_secret, &self.kek_salt, KEK_INFO, Digester::sha512())?;
         let mut out = Zeroizing::new(vec![0u8; self.encrypted_private_key.len()]);
         let tag_len = None;
-        let aead_ctx = AeadCtx::new(Aead::aes_256_gcm(), kek.as_slice(), tag_len)?;
+        let aead_ctx = AeadContext::new(Aead::aes_256_gcm(), kek.as_slice(), tag_len)?;
         let plaintext = aead_ctx.open(
             &self.encrypted_private_key,
             PRIVATE_KEY_NONCE,