From a58c7b6ea86eaafc17221ea981300e8cbf769ce0 Mon Sep 17 00:00:00 2001 From: Chris Frantz Date: Fri, 20 Dec 2024 07:49:10 -0800 Subject: [PATCH] [sphincsplus] Use NIST standard algorithm names 1. Use the formal NIST names for SPHINCS+ algorithms when saving or serializing keys. Accept the older names as aliases. - SLA-DSA-SHAKE-128s - SLA-DSA-SHA2-128s Signed-off-by: Chris Frantz --- sw/host/sphincsplus/variants.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sw/host/sphincsplus/variants.rs b/sw/host/sphincsplus/variants.rs index 9b5c41a4b67aa..df2daf3a8284a 100644 --- a/sw/host/sphincsplus/variants.rs +++ b/sw/host/sphincsplus/variants.rs @@ -233,11 +233,11 @@ algorithms! { #[derive(EnumString, Display, Serialize, Deserialize)] #[strum(ascii_case_insensitive)] pub enum SphincsPlus { - #[serde(rename="SPHINCS+-SHAKE-128s-simple", alias="SHAKE-128s-simple")] - #[strum(serialize="SPHINCS+-SHAKE-128s-simple", serialize="SHAKE-128s-simple")] + #[serde(rename="SLA-DSA-SHAKE-128s", alias="SPHINCS+-SHAKE-128s-simple", alias="SHAKE-128s-simple")] + #[strum(to_string="SLA-DSA-SHAKE-128s", serialize="SPHINCS+-SHAKE-128s-simple", serialize="SHAKE-128s-simple")] Shake128sSimple => shake_128s_simple, - #[serde(rename="SPHINCS+-SHA2-128s-simple", alias="SHA2-128s-simple")] - #[strum(serialize="SPHINCS+-SHA2-128s-simple", serialize="SHA2-128s-simple")] + #[serde(rename="SLA-DSA-SHA2-128s", alias="SPHINCS+-SHA2-128s-simple", alias="SHA2-128s-simple")] + #[strum(to_string="SLA-DSA-SHA2-128s", serialize="SPHINCS+-SHA2-128s-simple", serialize="SHA2-128s-simple")] Sha2128sSimple => sha2_128s_simple, } }