Rename ML-DSA (#844)

Author: justsmth

aws-lc-rs/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "aws-lc-rs"
 authors = ["AWS-LibCrypto"]
-version = "1.13.2"
+version = "1.13.3"
 # this crate re-exports whatever sys crate that was selected
-links = "aws_lc_rs_1_13_2_sys"
+links = "aws_lc_rs_1_13_3_sys"
 edition = "2021"
 rust-version = "1.63.0"
 keywords = ["crypto", "cryptography", "security"]

aws-lc-rs/src/pqdsa.rs

@@ -12,52 +12,52 @@ use std::os::raw::c_int;
 #[derive(Debug, Eq, PartialEq)]
 #[allow(non_camel_case_types)]
 pub(crate) enum AlgorithmID {
-    MLDSA_44,
-    MLDSA_65,
-    MLDSA_87,
+    ML_DSA_44,
+    ML_DSA_65,
+    ML_DSA_87,
 }
 
 impl AlgorithmID {
     #[allow(dead_code)]
     pub(crate) const fn from_nid(nid: c_int) -> Result<Self, Unspecified> {
         match nid {
-            NID_MLDSA44 => Ok(Self::MLDSA_44),
-            NID_MLDSA65 => Ok(Self::MLDSA_65),
-            NID_MLDSA87 => Ok(Self::MLDSA_87),
+            NID_MLDSA44 => Ok(Self::ML_DSA_44),
+            NID_MLDSA65 => Ok(Self::ML_DSA_65),
+            NID_MLDSA87 => Ok(Self::ML_DSA_87),
             _ => Err(Unspecified),
         }
     }
 
     pub(crate) const fn nid(&self) -> c_int {
         match self {
-            Self::MLDSA_44 => NID_MLDSA44,
-            Self::MLDSA_65 => NID_MLDSA65,
-            Self::MLDSA_87 => NID_MLDSA87,
+            Self::ML_DSA_44 => NID_MLDSA44,
+            Self::ML_DSA_65 => NID_MLDSA65,
+            Self::ML_DSA_87 => NID_MLDSA87,
         }
     }
 
     #[allow(dead_code)]
     pub(crate) const fn priv_key_size_bytes(&self) -> usize {
         match self {
-            Self::MLDSA_44 => 2560,
-            Self::MLDSA_65 => 4032,
-            Self::MLDSA_87 => 4896,
+            Self::ML_DSA_44 => 2560,
+            Self::ML_DSA_65 => 4032,
+            Self::ML_DSA_87 => 4896,
         }
     }
 
     pub(crate) const fn pub_key_size_bytes(&self) -> usize {
         match self {
-            Self::MLDSA_44 => 1312,
-            Self::MLDSA_65 => 1952,
-            Self::MLDSA_87 => 2592,
+            Self::ML_DSA_44 => 1312,
+            Self::ML_DSA_65 => 1952,
+            Self::ML_DSA_87 => 2592,
         }
     }
 
     pub(crate) const fn signature_size_bytes(&self) -> usize {
         match self {
-            Self::MLDSA_44 => 2420,
-            Self::MLDSA_65 => 3309,
-            Self::MLDSA_87 => 4627,
+            Self::ML_DSA_44 => 2420,
+            Self::ML_DSA_65 => 3309,
+            Self::ML_DSA_87 => 4627,
         }
     }
 }

aws-lc-rs/src/pqdsa/key_pair.rs

@@ -176,10 +176,10 @@ mod tests {
     use super::*;
 
     use crate::signature::{UnparsedPublicKey, VerificationAlgorithm};
-    use crate::unstable::signature::{MLDSA_44_SIGNING, MLDSA_65_SIGNING, MLDSA_87_SIGNING};
+    use crate::unstable::signature::{ML_DSA_44_SIGNING, ML_DSA_65_SIGNING, ML_DSA_87_SIGNING};
 
     const TEST_ALGORITHMS: &[&PqdsaSigningAlgorithm] =
-        &[&MLDSA_44_SIGNING, &MLDSA_65_SIGNING, &MLDSA_87_SIGNING];
+        &[&ML_DSA_44_SIGNING, &ML_DSA_65_SIGNING, &ML_DSA_87_SIGNING];
 
     #[test]
     fn test_public_key_serialization() {

aws-lc-rs/src/unstable/signature.rs

@@ -43,25 +43,55 @@ pub use crate::pqdsa::signature::{
 use crate::pqdsa::AlgorithmID;
 
 /// Verification of MLDSA-44 signatures
+#[deprecated(note = "Use ML_DSA_44")]
 pub static MLDSA_44: PqdsaVerificationAlgorithm = PqdsaVerificationAlgorithm {
-    id: &AlgorithmID::MLDSA_44,
+    id: &AlgorithmID::ML_DSA_44,
 };
 
 /// Verification of MLDSA-65 signatures
+#[deprecated(note = "Use ML_DSA_65")]
 pub static MLDSA_65: PqdsaVerificationAlgorithm = PqdsaVerificationAlgorithm {
-    id: &AlgorithmID::MLDSA_65,
+    id: &AlgorithmID::ML_DSA_65,
 };
 
 /// Verification of MLDSA-87 signatures
+#[deprecated(note = "Use ML_DSA_87")]
 pub static MLDSA_87: PqdsaVerificationAlgorithm = PqdsaVerificationAlgorithm {
-    id: &AlgorithmID::MLDSA_87,
+    id: &AlgorithmID::ML_DSA_87,
 };
 
 /// Sign using MLDSA-44
-pub static MLDSA_44_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&MLDSA_44);
+#[deprecated(note = "Use ML_DSA_44_SIGNING")]
+pub static MLDSA_44_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&ML_DSA_44);
 
 /// Sign using MLDSA-65
-pub static MLDSA_65_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&MLDSA_65);
+#[deprecated(note = "Use ML_DSA_65_SIGNING")]
+pub static MLDSA_65_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&ML_DSA_65);
 
 /// Sign using MLDSA-87
-pub static MLDSA_87_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&MLDSA_87);
+#[deprecated(note = "Use ML_DSA_87_SIGNING")]
+pub static MLDSA_87_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&ML_DSA_87);
+
+/// Verification of ML-DSA-44 signatures
+pub static ML_DSA_44: PqdsaVerificationAlgorithm = PqdsaVerificationAlgorithm {
+    id: &AlgorithmID::ML_DSA_44,
+};
+
+/// Verification of ML-DSA-65 signatures
+pub static ML_DSA_65: PqdsaVerificationAlgorithm = PqdsaVerificationAlgorithm {
+    id: &AlgorithmID::ML_DSA_65,
+};
+
+/// Verification of ML-DSA-87 signatures
+pub static ML_DSA_87: PqdsaVerificationAlgorithm = PqdsaVerificationAlgorithm {
+    id: &AlgorithmID::ML_DSA_87,
+};
+
+/// Sign using ML-DSA-44
+pub static ML_DSA_44_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&ML_DSA_44);
+
+/// Sign using ML-DSA-65
+pub static ML_DSA_65_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&ML_DSA_65);
+
+/// Sign using ML-DSA-87
+pub static ML_DSA_87_SIGNING: PqdsaSigningAlgorithm = PqdsaSigningAlgorithm(&ML_DSA_87);

aws-lc-rs/tests/pqdsa_test.rs

@@ -4,8 +4,8 @@
 
 use aws_lc_rs::signature::{KeyPair, VerificationAlgorithm};
 use aws_lc_rs::unstable::signature::{
-    PqdsaKeyPair, MLDSA_44, MLDSA_44_SIGNING, MLDSA_65, MLDSA_65_SIGNING, MLDSA_87,
-    MLDSA_87_SIGNING,
+    PqdsaKeyPair, ML_DSA_44, ML_DSA_44_SIGNING, ML_DSA_65, ML_DSA_65_SIGNING, ML_DSA_87,
+    ML_DSA_87_SIGNING,
 };
 use aws_lc_rs::{test, test_file};
 
@@ -51,30 +51,30 @@ macro_rules! mldsa_sigver_test {
 
 #[test]
 fn mldsa_44_keygen_test() {
-    mldsa_keygen_test!("data/MLDSA_44_ACVP_keyGen.txt", &MLDSA_44_SIGNING);
+    mldsa_keygen_test!("data/MLDSA_44_ACVP_keyGen.txt", &ML_DSA_44_SIGNING);
 }
 
 #[test]
 fn mldsa_65_keygen_test() {
-    mldsa_keygen_test!("data/MLDSA_65_ACVP_keyGen.txt", &MLDSA_65_SIGNING);
+    mldsa_keygen_test!("data/MLDSA_65_ACVP_keyGen.txt", &ML_DSA_65_SIGNING);
 }
 
 #[test]
 fn mldsa_87_keygen_test() {
-    mldsa_keygen_test!("data/MLDSA_87_ACVP_keyGen.txt", &MLDSA_87_SIGNING);
+    mldsa_keygen_test!("data/MLDSA_87_ACVP_keyGen.txt", &ML_DSA_87_SIGNING);
 }
 
 #[test]
 fn mldsa_44_sigver_test() {
-    mldsa_sigver_test!("data/MLDSA_44_sigVer.txt", &MLDSA_44);
+    mldsa_sigver_test!("data/MLDSA_44_sigVer.txt", &ML_DSA_44);
 }
 
 #[test]
 fn mldsa_65_sigver_test() {
-    mldsa_sigver_test!("data/MLDSA_65_sigVer.txt", &MLDSA_65);
+    mldsa_sigver_test!("data/MLDSA_65_sigVer.txt", &ML_DSA_65);
 }
 
 #[test]
 fn mldsa_87_sigver_test() {
-    mldsa_sigver_test!("data/MLDSA_87_sigVer.txt", &MLDSA_87);
+    mldsa_sigver_test!("data/MLDSA_87_sigVer.txt", &ML_DSA_87);
 }