Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions parquet/src/encryption/ciphers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::errors::ParquetError;
use crate::errors::ParquetError::General;
use crate::errors::Result;
use crate::file::metadata::HeapSize;
use ring::aead::{AES_128_GCM, Aad, LessSafeKey, NonceSequence, UnboundKey};
use ring::aead::{AES_128_GCM, AES_256_GCM, Aad, LessSafeKey, NonceSequence, UnboundKey};
use ring::rand::{SecureRandom, SystemRandom};
use std::fmt::Debug;

Expand All @@ -40,10 +40,20 @@ pub(crate) struct RingGcmBlockDecryptor {
}

impl RingGcmBlockDecryptor {
/// Create a new `RingGcmBlockDecryptor` with a given key.
pub(crate) fn new(key_bytes: &[u8]) -> Result<Self> {
// todo support other key sizes
let key = UnboundKey::new(&AES_128_GCM, key_bytes)
.map_err(|_| General("Failed to create AES key".to_string()))?;
let algorithm = if key_bytes.len() == AES_128_GCM.key_len() {
&AES_128_GCM
} else if key_bytes.len() == AES_256_GCM.key_len() {
&AES_256_GCM
} else {
return Err(general_err!(
"Error creating RingGcmBlockDecryptor with unsupported key length: {}",
key_bytes.len()
));
};
let key = UnboundKey::new(algorithm, key_bytes)
.map_err(|_| general_err!("Failed to create {:?} key", algorithm))?;

Ok(Self {
key: LessSafeKey::new(key),
Expand Down Expand Up @@ -144,10 +154,19 @@ impl RingGcmBlockEncryptor {
/// return an error if it wraps around.
pub(crate) fn new(key_bytes: &[u8]) -> Result<Self> {
let rng = SystemRandom::new();

// todo support other key sizes
let key = UnboundKey::new(&AES_128_GCM, key_bytes)
.map_err(|e| general_err!("Error creating AES key: {}", e))?;
let algorithm = if key_bytes.len() == AES_128_GCM.key_len() {
&AES_128_GCM
} else if key_bytes.len() == AES_256_GCM.key_len() {
&AES_256_GCM
} else {
return Err(general_err!(
"Error creating RingGcmBlockEncryptor with unsupported key length: {}",
key_bytes.len()
));
};

let key = UnboundKey::new(algorithm, key_bytes)
.map_err(|e| general_err!("Error creating {:?} key: {}", algorithm, e))?;
let nonce = CounterNonce::new(&rng)?;

Ok(Self {
Expand Down
Loading
Loading