From 1343dcaf011ee81941d9160e9f12e6c36ca69d50 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 22 Jan 2024 12:50:33 +0100 Subject: [PATCH] tape: move 'set_encryption' calls to the TapeDriver (and implementation) namely everytime we know what the key for the tape has to be: * after we write the MediaSetLabel * after reading the MediaSetLabel When handling data on tape, we always have to have the MediaSetLabel, so we should always trigger one of these. Because of that, we should not be able to forget to set the encryption mode. Signed-off-by: Dominik Csapak --- src/api2/tape/drive.rs | 9 --------- src/api2/tape/restore.rs | 12 ------------ src/tape/drive/lto/mod.rs | 7 +++++++ src/tape/drive/mod.rs | 12 ++++++++++++ src/tape/pool_writer/mod.rs | 9 --------- 5 files changed, 19 insertions(+), 30 deletions(-) diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 633a236d..53b14bfd 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -677,9 +677,6 @@ pub async fn read_label(drive: String, inventorize: Option) -> Result, diff --git a/src/tape/pool_writer/mod.rs b/src/tape/pool_writer/mod.rs index d1add203..6fd4f72a 100644 --- a/src/tape/pool_writer/mod.rs +++ b/src/tape/pool_writer/mod.rs @@ -270,15 +270,6 @@ impl PoolWriter { self.catalog_set.lock().unwrap().append_catalog(catalog)?; - let media_set = media.media_set_label().unwrap(); - - let encrypt_fingerprint = media_set - .encryption_key_fingerprint - .clone() - .map(|fp| (fp, media_set.uuid.clone())); - - drive.set_encryption(encrypt_fingerprint)?; - self.status = Some(PoolWriterState { drive, media_uuid: media_uuid.clone(), -- 2.39.5