RawEncCipher -> EncCipher

Author: cowlicks

src/crypto/cipher.rs

@@ -102,17 +102,17 @@ fn write_stream_id(handshake_hash: &[u8], is_initiator: bool, out: &mut [u8]) {
 //NB "raw" here means UN-framed. No frame header.
 const RAW_HEADER_MSG_LEN: usize = STREAM_ID_LENGTH + Header::BYTES;
 
-pub(crate) struct RawEncryptCipher {
+pub(crate) struct EncryptCipher {
     push_stream: PushStream,
 }
 
-impl std::fmt::Debug for RawEncryptCipher {
+impl std::fmt::Debug for EncryptCipher {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "RawEncryptCipher(crypto_secretstream)")
     }
 }
 
-impl RawEncryptCipher {
+impl EncryptCipher {
     pub(crate) fn from_handshake_tx(
         handshake_result: &HandshakeResult,
     ) -> std::io::Result<(Self, Vec<u8>)> {

src/crypto/mod.rs

@@ -1,5 +1,5 @@
 mod cipher;
 mod curve;
 mod handshake;
-pub(crate) use cipher::{DecryptCipher, RawEncryptCipher};
+pub(crate) use cipher::{DecryptCipher, EncryptCipher};
 pub(crate) use handshake::{Handshake, HandshakeResult};

src/noise.rs

@@ -10,7 +10,7 @@ use std::{
 use tracing::{debug, error, instrument, trace, warn};
 
 use crate::{
-    crypto::{DecryptCipher, Handshake, HandshakeResult, RawEncryptCipher},
+    crypto::{DecryptCipher, EncryptCipher, Handshake, HandshakeResult},
     Uint24LELengthPrefixedFraming,
 };
 
@@ -27,8 +27,8 @@ pub fn encrypted_framed_message_channel<IO: AsyncWrite + AsyncRead + Send + Unpi
 pub(crate) enum Step {
     NotInitialized,
     Handshake(Box<Handshake>),
-    SecretStream((RawEncryptCipher, HandshakeResult)),
-    Established((RawEncryptCipher, DecryptCipher, HandshakeResult)),
+    SecretStream((EncryptCipher, HandshakeResult)),
+    Established((EncryptCipher, DecryptCipher, HandshakeResult)),
 }
 
 impl Step {
@@ -458,7 +458,7 @@ fn poll_decrypt(
 
 #[instrument(skip_all)]
 fn poll_encrypt(
-    encryptor: &mut RawEncryptCipher,
+    encryptor: &mut EncryptCipher,
     encrypted_tx: &mut VecDeque<Vec<u8>>,
     plain_tx: &mut VecDeque<Vec<u8>>,
     is_initiator: bool,
@@ -568,7 +568,7 @@ fn handle_setup_message(
                     };
                     // The cipher will be put to use to the writer only after the peer's answer has come
                     let (cipher, init_msg) =
-                        match RawEncryptCipher::from_handshake_tx(handshake_result) {
+                        match EncryptCipher::from_handshake_tx(handshake_result) {
                             Ok(x) => x,
                             Err(e) => {
                                 error!("from_handshake_tx error {e:?}");