Rename EncryptionAlgorithm to PKIEncryptionAlgorithm.

Author: AureliaDolo

libparsec/crates/platform_device_loader/tests/units/list.rs

@@ -173,7 +173,7 @@ async fn list_devices(tmp_path: TmpPath) {
             .add_or_replace_uri(X509WindowsCngURI::from(Bytes::from_static(
                 b"Mallory's certificate",
             ))),
-        algorithm_for_encrypted_key: EncryptionAlgorithm::RsaesOaepSha256,
+        algorithm_for_encrypted_key: PKIEncryptionAlgorithm::RsaesOaepSha256,
         encrypted_key: hex!("de5c59cfcc0c52bf997594e0fdd2c24ffee9465b6f25e30bac9238c2f83fd19a")
             .as_ref()
             .into(),

libparsec/crates/platform_device_loader/tests/units/pki/save.rs

@@ -33,7 +33,7 @@ async fn ok_simple(tmp_path: TmpPath, env: &TestbedEnv) {
             human_handle: alice_device.human_handle.clone(),
         },
         encrypted_key: Bytes::from_static(b"encrypted key"),
-        encrypted_key_algo: libparsec_types::EncryptionAlgorithm::RsaesOaepSha256,
+        encrypted_key_algo: libparsec_types::PKIEncryptionAlgorithm::RsaesOaepSha256,
         ciphertext: Bytes::from_static(b"encrypted secret part"),
     };
     save_pki_local_pending(local_pending, path).await.unwrap();

libparsec/crates/platform_pki/examples/decrypt_message.rs

@@ -6,7 +6,7 @@ mod utils;
 use anyhow::Context;
 use clap::Parser;
 use libparsec_platform_pki::decrypt_message;
-use libparsec_types::{EncryptionAlgorithm, X509CertificateHash};
+use libparsec_types::{PKIEncryptionAlgorithm, X509CertificateHash};
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -16,8 +16,8 @@ struct Args {
     #[command(flatten)]
     content: utils::ContentOpts,
     /// The algorithm used to encrypt the content.
-    #[arg(long, default_value_t = EncryptionAlgorithm::RsaesOaepSha256)]
-    algorithm: EncryptionAlgorithm,
+    #[arg(long, default_value_t = PKIEncryptionAlgorithm::RsaesOaepSha256)]
+    algorithm: PKIEncryptionAlgorithm,
 }
 
 fn main() -> anyhow::Result<()> {

libparsec/crates/platform_pki/src/lib.rs

@@ -10,7 +10,7 @@ pub mod x509;
 #[path = "../tests/units/mod.rs"]
 mod test;
 
-use libparsec_types::{EncryptionAlgorithm, PkiSignatureAlgorithm, X509CertificateReference};
+use libparsec_types::{PKIEncryptionAlgorithm, PkiSignatureAlgorithm, X509CertificateReference};
 
 use bytes::Bytes;
 
@@ -25,7 +25,7 @@ mod platform {
         DecryptedMessage, EncryptMessageError, EncryptedMessage, GetDerEncodedCertificateError,
         ShowCertificateSelectionDialogError, SignMessageError, SignedMessageFromPki,
     };
-    use libparsec_types::{EncryptionAlgorithm, X509CertificateReference};
+    use libparsec_types::{PKIEncryptionAlgorithm, X509CertificateReference};
 
     pub fn get_der_encoded_certificate(
         certificate_ref: &X509CertificateReference,
@@ -57,7 +57,7 @@ mod platform {
     }
 
     pub fn decrypt_message(
-        algo: EncryptionAlgorithm,
+        algo: PKIEncryptionAlgorithm,
         encrypted_message: &[u8],
         certificate_ref: &X509CertificateReference,
     ) -> Result<DecryptedMessage, DecryptMessageError> {
@@ -125,7 +125,7 @@ pub use platform::sign_message;
 pub use shared::{verify_message, Certificate, SignedMessage};
 
 pub struct EncryptedMessage {
-    pub algo: EncryptionAlgorithm,
+    pub algo: PKIEncryptionAlgorithm,
     pub cert_ref: X509CertificateReference,
     pub ciphered: Bytes,
 }

libparsec/crates/platform_pki/src/windows/mod.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 use bytes::Bytes;
 use libparsec_types::{
-    EncryptionAlgorithm, PkiSignatureAlgorithm, X509CertificateHash, X509CertificateReference,
+    PKIEncryptionAlgorithm, PkiSignatureAlgorithm, X509CertificateHash, X509CertificateReference,
     X509WindowsCngURI,
 };
 use schannel::{
@@ -352,8 +352,8 @@ pub fn encrypt_message(
 fn ncrypt_encrypt_message_with_rsa(
     message: &[u8],
     handle: &NcryptKey,
-) -> std::io::Result<(EncryptionAlgorithm, Vec<u8>)> {
-    const ALGO: EncryptionAlgorithm = EncryptionAlgorithm::RsaesOaepSha256;
+) -> std::io::Result<(PKIEncryptionAlgorithm, Vec<u8>)> {
+    const ALGO: PKIEncryptionAlgorithm = PKIEncryptionAlgorithm::RsaesOaepSha256;
     // SAFETY: NcryptKey is obtain from an NCRYPT_KEY_HANDLE, here we retrieve the underlying
     // handle.
     let raw_handle = unsafe { RawPointer::as_ptr(handle) } as NCRYPT_KEY_HANDLE;
@@ -413,7 +413,7 @@ fn ncrypt_encrypt_message_with_rsa(
 }
 
 pub fn decrypt_message(
-    algo: EncryptionAlgorithm,
+    algo: PKIEncryptionAlgorithm,
     encrypted_message: &[u8],
     certificate_ref: &X509CertificateReference,
 ) -> Result<DecryptedMessage, DecryptMessageError> {
@@ -430,7 +430,7 @@ pub fn decrypt_message(
         }
         // Handle to a CryptoGraphy Next Generation (CNG) API
         PrivateKey::NcryptKey(handle) => {
-            if algo != EncryptionAlgorithm::RsaesOaepSha256 {
+            if algo != PKIEncryptionAlgorithm::RsaesOaepSha256 {
                 todo!("Unsupported encryption algo '{algo}'");
             }
             ncrypt_decrypt_message_with_rsa(encrypted_message, &handle).map(Into::into)

libparsec/crates/serialization_format/src/protocol_python_bindings.rs

@@ -944,7 +944,9 @@ fn quote_type_as_fn_getter_conversion(field_path: &TokenStream, ty: &FieldType)
         FieldType::X509CertificateReference => {
             quote_rs_to_py_class!(crate::data::X509CertificateReference)
         }
-        FieldType::EncryptionAlgorithm => quote_rs_to_py_class!(crate::data::EncryptionAlgorithm),
+        FieldType::PKIEncryptionAlgorithm => {
+            quote_rs_to_py_class!(crate::data::PKIEncryptionAlgorithm)
+        }
         FieldType::PkiSignatureAlgorithm => {
             quote_rs_to_py_class!(crate::data::PkiSignatureAlgorithm)
         }
@@ -1047,7 +1049,7 @@ fn quote_type_as_fn_new_param(ty: &FieldType) -> TokenStream {
         FieldType::PkiEnrollmentSubmitPayload => quote! { crate::data::PkiEnrollmentSubmitPayload },
         FieldType::X509Certificate => quote! { crate::data::X509Certificate },
         FieldType::X509CertificateReference => quote! { crate::data::X509CertificateReference },
-        FieldType::EncryptionAlgorithm => quote! { crate::data::EncryptionAlgorithm },
+        FieldType::PKIEncryptionAlgorithm => quote! { crate::data::PKIEncryptionAlgorithm },
         FieldType::PkiSignatureAlgorithm => quote! { crate::data::PkiSignatureAlgorithm },
         FieldType::ShamirRecoveryShareData => {
             quote! { crate::shamir::ShamirRecoveryShareData}
@@ -1194,7 +1196,7 @@ fn internal_quote_field_as_fn_new_conversion(field_name: &Ident, ty: &FieldType)
         | FieldType::PkiEnrollmentSubmitPayload
         | FieldType::X509Certificate
         | FieldType::X509CertificateReference
-        | FieldType::EncryptionAlgorithm
+        | FieldType::PKIEncryptionAlgorithm
         | FieldType::PkiSignatureAlgorithm
         | FieldType::GreetingAttemptID
         | FieldType::CancelledGreetingAttemptReason

libparsec/crates/serialization_format/src/types.rs

@@ -257,7 +257,7 @@ generate_field_type_enum!(
     PkiEnrollmentSubmitPayload => PkiEnrollmentSubmitPayload,
     X509Certificate => libparsec_types::X509Certificate,
     X509CertificateReference => libparsec_types::X509CertificateReference,
-    EncryptionAlgorithm => libparsec_types::EncryptionAlgorithm,
+    PKIEncryptionAlgorithm => libparsec_types::PKIEncryptionAlgorithm,
     PkiSignatureAlgorithm => libparsec_types::PkiSignatureAlgorithm,
     GreetingAttemptID => libparsec_types::GreetingAttemptID,
     GreeterOrClaimer => libparsec_types::GreeterOrClaimer,

libparsec/crates/types/schema/pki/local_pending_enrollment.json5

@@ -35,7 +35,7 @@
         },
         {
             "name": "encrypted_key_algo",
-            "type": "EncryptionAlgorithm"
+            "type": "PKIEncryptionAlgorithm"
         },
         {
             "name": "ciphertext",

libparsec/crates/types/src/local_device_file.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 
 use libparsec_serialization_format::parsec_data;
 
-use crate::{self as libparsec_types, DataError, EncryptionAlgorithm, X509CertificateReference};
+use crate::{self as libparsec_types, DataError, PKIEncryptionAlgorithm, X509CertificateReference};
 use crate::{
     impl_transparent_data_format_conversion, AccountVaultItemOpaqueKeyID, DateTime, DeviceID,
     DeviceLabel, HumanHandle, OrganizationID, PasswordAlgorithm, UserID,
@@ -119,7 +119,7 @@ pub struct DeviceFileSmartcard {
     pub human_handle: HumanHandle,
     pub device_label: DeviceLabel,
     pub certificate_ref: X509CertificateReference,
-    pub algorithm_for_encrypted_key: EncryptionAlgorithm,
+    pub algorithm_for_encrypted_key: PKIEncryptionAlgorithm,
     pub encrypted_key: Bytes,
     pub ciphertext: Bytes,
 }

libparsec/crates/types/src/pki/mod.rs

@@ -150,7 +150,7 @@ pub struct PKILocalPendingEnrollment {
     pub enrollment_id: PKIEnrollmentID,
     pub payload: PkiEnrollmentSubmitPayload,
     pub encrypted_key: Bytes,
-    pub encrypted_key_algo: EncryptionAlgorithm,
+    pub encrypted_key_algo: PKIEncryptionAlgorithm,
     pub ciphertext: Bytes,
 }
 
@@ -225,19 +225,19 @@ impl PrivateParts {
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, serde_with::DeserializeFromStr, serde_with::SerializeDisplay,
 )]
-pub enum EncryptionAlgorithm {
+pub enum PKIEncryptionAlgorithm {
     RsaesOaepSha256,
 }
 
-impl From<EncryptionAlgorithm> for &'static str {
-    fn from(value: EncryptionAlgorithm) -> Self {
+impl From<PKIEncryptionAlgorithm> for &'static str {
+    fn from(value: PKIEncryptionAlgorithm) -> Self {
         match value {
-            EncryptionAlgorithm::RsaesOaepSha256 => "RSAES-OAEP-SHA256",
+            PKIEncryptionAlgorithm::RsaesOaepSha256 => "RSAES-OAEP-SHA256",
         }
     }
 }
 
-impl FromStr for EncryptionAlgorithm {
+impl FromStr for PKIEncryptionAlgorithm {
     type Err = &'static str;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -248,7 +248,7 @@ impl FromStr for EncryptionAlgorithm {
     }
 }
 
-impl Display for EncryptionAlgorithm {
+impl Display for PKIEncryptionAlgorithm {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str((*self).into())
     }