code review

src/aes.rs

@@ -125,12 +125,12 @@ impl<R: Read> AesReader<R> {
         })
     }
 
-    /// Read the AES header bytes and returns the key and salt.
+    /// Read the AES header bytes and returns the verification value and salt.
     ///
     /// # Returns
     ///
-    /// the key and the salt
+    /// the verification value and the salt
-    pub fn get_key_and_salt(mut self) -> io::Result<(Vec<u8>, Vec<u8>)> {
+    pub fn get_verification_value_and_salt(mut self) -> io::Result<(Vec<u8>, Vec<u8>)> {
         let salt_length = self.aes_mode.salt_length();
 
         let mut salt = vec![0; salt_length];

src/read.rs

@@ -645,8 +645,16 @@ impl<R: Read + Seek> ZipArchive<R> {
         Ok(shared)
     }
 
-    /// Returns key and salt
+    /// Returns the verification value and salt for the AES encryption of the file
-    pub fn get_aes_key_and_salt(
+    ///
+    /// It fails if the file is not encrypted or if the file number is invalid.
+    ///
+    /// # Returns
+    ///
+    /// - Some with the verification value and the salt
+    /// - None if the file is not encrypted with AES
+    #[cfg(feature = "aes-crypto")]
+    pub fn get_aes_verification_key_and_salt(
         &mut self,
         file_number: usize,
     ) -> ZipResult<Option<(AesMode, Vec<u8>, Vec<u8>)>> {
@@ -657,15 +665,14 @@ impl<R: Read + Seek> ZipArchive<R> {
             .ok_or(ZipError::FileNotFound)?;
 
         if !data.encrypted {
-            return Err(ZipError::UnsupportedArchive(ZipError::PASSWORD_REQUIRED));
+            return Err(ZipError::UnsupportedArchive(ZipError::ARCHIVE_NOT_ENCRYPTED));
         }
         let limit_reader = find_content(data, &mut self.reader)?;
         match data.aes_mode {
             None => Ok(None),
             Some((aes_mode, _, _)) => {
                 let (key, salt) = AesReader::new(limit_reader, aes_mode, data.compressed_size)
-                    .get_key_and_salt()
+                    .get_verification_value_and_salt()?;
-                    .expect("AES reader failed");
                 Ok(Some((aes_mode, key, salt)))
             }
         }

src/result.rs

@@ -46,6 +46,10 @@ impl ZipError {
     /// # ()
     /// ```
     pub const PASSWORD_REQUIRED: &'static str = "Password required to decrypt file";
+
+
+    /// The text used as an error when the archive is not encrypted
+    pub const ARCHIVE_NOT_ENCRYPTED: &'static str = "the archive is not encrypted";
 }
 
 impl From<ZipError> for io::Error {