From 03b116753779c271e11184f0cdcc3b66f9d7777c Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sat, 26 Aug 2023 22:48:50 +0800
Subject: [PATCH] feat: update Aes128GcmStreamEncryptor

---
 src/lib.rs  | 10 +++++-----
 src/main.rs |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 3e6de01..2964e1d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,7 @@ use aes::Aes128;
 use aes::cipher::{Block, BlockEncrypt, KeyInit};
 use aes::cipher::generic_array::GenericArray;
 
-pub struct Aes128GcmStream {
+pub struct Aes128GcmStreamEncryptor {
     crypto: Aes128,
     message_buffer: Vec<u8>,
     integrality_buffer: Vec<u8>,
@@ -14,7 +14,7 @@ pub struct Aes128GcmStream {
     message_len: usize,
 }
 
-impl Aes128GcmStream {
+impl Aes128GcmStreamEncryptor {
     pub fn new(key: [u8; 16]) -> Self {
         let key = GenericArray::from(key);
         let aes = Aes128::new(&key);
@@ -119,12 +119,12 @@ impl Aes128GcmStream {
         let integrality_buffer_slice = self.integrality_buffer.as_slice();
         let integrality_buffer_slice_len = integrality_buffer_slice.len();
         if integrality_buffer_slice_len >= 16 {
-            let i_blocks_count = integrality_buffer_slice_len / 16;
-            for i in 0..i_blocks_count {
+            let blocks_count = integrality_buffer_slice_len / 16;
+            for i in 0..blocks_count {
                 let buf = &integrality_buffer_slice[i * 16..(i + 1) * 16];
                 self.ghash_val = gmul_128(self.ghash_val ^ u8to128(buf), self.ghash_key)
             }
-            self.integrality_buffer = integrality_buffer_slice[i_blocks_count * 16..].to_vec();
+            self.integrality_buffer = integrality_buffer_slice[blocks_count * 16..].to_vec();
         }
     }
 
diff --git a/src/main.rs b/src/main.rs
index 9da1db4..d664c22 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,7 @@ use aes::cipher::KeyInit;
 use aes_gcm::{AeadInPlace, Aes128Gcm, Key};
 use aes_gcm::aead::{Aead, Nonce};
 
-use aes_gcm_stream::Aes128GcmStream;
+use aes_gcm_stream::Aes128GcmStreamEncryptor;
 
 use crate::copied::GCM;
 
@@ -42,7 +42,7 @@ fn main() {
     cipher.encrypt_in_place(&nonce, &[], &mut ciphertext).unwrap();
     println!("{}", hex::encode(ciphertext.as_slice()));
 
-    let mut aes128_gcm_stream = Aes128GcmStream::new([0; 16]);
+    let mut aes128_gcm_stream = Aes128GcmStreamEncryptor::new([0; 16]);
     aes128_gcm_stream.init_nonce(&[0u8; 12]);
     aes128_gcm_stream.init_adata(&[]);
     let o1 = aes128_gcm_stream.next(&plaintext[0..21]);