common: Move the EncryptedData structure from common to the library

Move the EncryptedData from the common.rs file to the Keylime library in
the keylime::crypto::encrypted_data module.

Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

Author: ansasaki

keylime-agent/src/common.rs

@@ -78,29 +78,6 @@ where
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub struct EncryptedData {
-    bytes: Vec<u8>,
-}
-
-impl AsRef<[u8]> for EncryptedData {
-    fn as_ref(&self) -> &[u8] {
-        self.bytes.as_slice()
-    }
-}
-
-impl From<&[u8]> for EncryptedData {
-    fn from(v: &[u8]) -> Self {
-        EncryptedData { bytes: v.to_vec() }
-    }
-}
-
-impl From<Vec<u8>> for EncryptedData {
-    fn from(v: Vec<u8>) -> Self {
-        EncryptedData { bytes: v }
-    }
-}
-
 // TPM data and agent related that can be persisted and loaded on agent startup.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub(crate) struct AgentData {

keylime-agent/src/keys_handler.rs

@@ -2,7 +2,7 @@
 // Copyright 2021 Keylime Authors
 
 use crate::{
-    common::{EncryptedData, JsonWrapper},
+    common::JsonWrapper,
     config::KeylimeConfig,
     payloads::{Payload, PayloadMessage},
     Error, QuoteData, Result,
@@ -11,8 +11,9 @@ use actix_web::{http, web, HttpRequest, HttpResponse, Responder};
 use base64::{engine::general_purpose, Engine as _};
 use keylime::crypto::{
     self,
-    symmkey::{KeySet, SymmKey},
     auth_tag::AuthTag,
+    encrypted_data::EncryptedData,
+    symmkey::{KeySet, SymmKey},
 };
 use log::*;
 use serde::{Deserialize, Serialize};

keylime-agent/src/payloads.rs

@@ -2,7 +2,6 @@
 // Copyright 2021 Keylime Authors
 
 use crate::{
-    common::EncryptedData,
     config,
     revocation::{Revocation, RevocationMessage},
     Error, Result,
@@ -13,6 +12,7 @@ use crate::revocation::ZmqMessage;
 
 use keylime::crypto::{
     self,
+    encrypted_data::EncryptedData,
     symmkey::{KeySet, SymmKey},
 };
 use log::*;

keylime/src/crypto.rs

@@ -2,6 +2,7 @@
 // Copyright 2021 Keylime Authors
 
 pub mod auth_tag;
+pub mod encrypted_data;
 pub mod symmkey;
 pub mod x509;
 

keylime/src/crypto/encrypted_data.rs

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 Keylime Authors
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct EncryptedData {
+    bytes: Vec<u8>,
+}
+
+impl AsRef<[u8]> for EncryptedData {
+    fn as_ref(&self) -> &[u8] {
+        self.bytes.as_slice()
+    }
+}
+
+impl From<&[u8]> for EncryptedData {
+    fn from(v: &[u8]) -> Self {
+        EncryptedData { bytes: v.to_vec() }
+    }
+}
+
+impl From<Vec<u8>> for EncryptedData {
+    fn from(v: Vec<u8>) -> Self {
+        EncryptedData { bytes: v }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_encrypted_data_as_ref() {
+        let a = EncryptedData {
+            bytes: vec![0x0A, 16],
+        };
+
+        let r = a.as_ref();
+        assert_eq!(r, vec![0x0A, 16]);
+    }
+
+    #[test]
+    fn test_encrypted_data_from_slice() {
+        let a: [u8; 16] = [0x0B; 16];
+        let expected = EncryptedData {
+            bytes: vec![0x0B; 16],
+        };
+
+        let r = EncryptedData::from(a.as_ref());
+
+        assert_eq!(r, expected);
+    }
+
+    #[test]
+    fn test_encrypted_data_from_vec() {
+        let a: Vec<u8> = vec![0x0C; 16];
+        let expected = EncryptedData {
+            bytes: vec![0x0C; 16],
+        };
+
+        let r = EncryptedData::from(a);
+
+        assert_eq!(r, expected);
+    }
+}