tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix typo s/CGM/GCM/i 

only user visible change is in the error message

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-10-27 09:05:51 +02:00 committed by Thomas Lamprecht
parent 88691284d8
commit 572e6594d2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pbs-config/src/key_config.rs
View File

@ -67,7 +67,7 @@ impl KeyDerivationConfig {
/// Encryption Key Configuration /// Encryption Key Configuration
/// ///
/// We use this struct to store secret keys. When used with a key /// We use this struct to store secret keys. When used with a key
/// derivation function, the key data is encrypted (AES-CGM), and you /// derivation function, the key data is encrypted (AES-GCM), and you
/// need the password to restore the plain key. /// need the password to restore the plain key.
#[derive(Deserialize, Serialize, Clone, Debug)] #[derive(Deserialize, Serialize, Clone, Debug)]
pub struct KeyConfig { pub struct KeyConfig {

12
pbs-tape/src/sg_tape/encryption.rs
View File

@ -10,7 +10,7 @@ use crate::sgutils2::{SgRaw, alloc_page_aligned_buffer};
/// Test if drive supports hardware encryption /// Test if drive supports hardware encryption
/// ///
/// We search for AES_CGM algorithm with 256bits key. /// We search for AES_GCM algorithm with 256bits key.
pub fn has_encryption<F: AsRawFd>( pub fn has_encryption<F: AsRawFd>(
file: &mut F, file: &mut F,
) -> bool { ) -> bool {
@ -213,14 +213,14 @@ struct SspDataEncryptionAlgorithmDescriptor {
algorithm_code: u32, algorithm_code: u32,
} }
// Returns the algorythm_index for AES-CGM // Returns the algorythm_index for AES-GCM
fn decode_spin_data_encryption_caps(data: &[u8]) -> Result<u8, Error> { fn decode_spin_data_encryption_caps(data: &[u8]) -> Result<u8, Error> {
proxmox_lang::try_block!({ proxmox_lang::try_block!({
let mut reader = &data[..]; let mut reader = &data[..];
let _page: SspDataEncryptionCapabilityPage = unsafe { reader.read_be_value()? }; let _page: SspDataEncryptionCapabilityPage = unsafe { reader.read_be_value()? };
let mut aes_cgm_index = None; let mut aes_gcm_index = None;
loop { loop {
if reader.is_empty() { break; }; if reader.is_empty() { break; };
@ -236,14 +236,14 @@ fn decode_spin_data_encryption_caps(data: &[u8]) -> Result<u8, Error> {
continue; // can't decrypt in hardware continue; // can't decrypt in hardware
} }
if desc.algorithm_code == 0x00010014 && desc.key_size == 32 { if desc.algorithm_code == 0x00010014 && desc.key_size == 32 {
aes_cgm_index = Some(desc.algorythm_index); aes_gcm_index = Some(desc.algorythm_index);
break; break;
} }
} }
match aes_cgm_index { match aes_gcm_index {
Some(index) => Ok(index), Some(index) => Ok(index),
None => bail!("drive does not support AES-CGM encryption"), None => bail!("drive does not support AES-GCM encryption"),
} }
}).map_err(|err: Error| format_err!("decode data encryption caps page failed - {}", err)) }).map_err(|err: Error| format_err!("decode data encryption caps page failed - {}", err))