Skip to content

Commit 925d93d

Browse files
committed
Fix
1 parent 3cbc125 commit 925d93d

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

parquet/src/encryption/encrypt.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,9 @@ pub(crate) fn write_signed_plaintext_object<T: TSerializable, W: Write>(
409409
sink.write_all(&buffer)?;
410410
buffer = encryptor.encrypt(buffer.as_ref(), module_aad)?;
411411

412-
let ciphertext_length : u32 = buffer.len()
413-
.try_into()
414-
.map_err(|err| general_err!("Plaintext data too long. {:?}", err))?;
415-
416412
// Format of encrypted buffer is: [ciphertext size, nonce, ciphertext, authentication tag]
417413
let nonce = &buffer[SIZE_LEN..SIZE_LEN + NONCE_LEN];
418-
let tag = &buffer[(buffer.len() - TAG_LEN)..];
414+
let tag = &buffer[buffer.len() - TAG_LEN..];
419415
sink.write_all(nonce)?;
420416
sink.write_all(tag)?;
421417

parquet/src/file/metadata/writer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#[cfg(feature = "encryption")]
1919
use crate::encryption::{
20-
encrypt::{encrypt_object, encrypt_object_to_vec, sign_and_write_object, FileEncryptor},
20+
encrypt::{encrypt_object, encrypt_object_to_vec, write_signed_plaintext_object, FileEncryptor},
2121
modules::{create_footer_aad, create_module_aad, ModuleType},
2222
};
2323
#[cfg(feature = "encryption")]
@@ -516,7 +516,7 @@ impl MetadataObjectWriter {
516516
Some(file_encryptor) if file_metadata.encryption_algorithm.is_some() => {
517517
let aad = create_footer_aad(file_encryptor.file_aad())?;
518518
let mut encryptor = file_encryptor.get_footer_encryptor()?;
519-
sign_and_write_object(file_metadata, &mut encryptor, &mut sink, &aad)
519+
write_signed_plaintext_object(file_metadata, &mut encryptor, &mut sink, &aad)
520520
}
521521
_ => Self::write_object(file_metadata, &mut sink),
522522
}

0 commit comments

Comments
 (0)