added serde tests

Author: LWEdslev

Diff for: Cargo.lock

@@ -37,6 +37,7 @@ base64ct = { version = "1", features = ["alloc"] }
 hex-literal = "0.4.1"
 proptest = "1"
 serde_test = "1.0.89"
+serde_json = "1.0.114"
 rand_xorshift = "0.3"
 rand_chacha = "0.3"
 rand = "0.8"

Diff for: Cargo.toml

@@ -8,11 +8,11 @@ use alloc::{
     string::{String, ToString},
     vec::Vec,
 };
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
 use core::marker::PhantomData;
 use digest::{Digest, FixedOutputReset};
 use rand_core::CryptoRngCore;
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
 use zeroize::ZeroizeOnDrop;
 
 /// Decryption key for PKCS#1 v1.5 decryption as described in [RFC8017 § 7.1].
@@ -97,3 +97,29 @@ where
     MGD: Digest + FixedOutputReset,
 {
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use sha2::Sha256;
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let decrypting_key = DecryptingKey::<Sha256>::new_with_label(
+            RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key"),
+            "label",
+        );
+
+        let ser_decrypting_key =
+            serde_json::to_string(&decrypting_key).expect("unable to serialize decrypting key");
+        let deser_decrypting_key = serde_json::from_str::<DecryptingKey<Sha256>>(&ser_decrypting_key)
+            .expect("unable to serialize decrypting key");
+
+        assert_eq!(decrypting_key.label, deser_decrypting_key.label);
+        assert_eq!(decrypting_key.inner, deser_decrypting_key.inner);
+    }
+}

Diff for: src/oaep/decrypting_key.rs

@@ -65,3 +65,31 @@ where
         encrypt_digest::<_, D, MGD>(rng, &self.inner, msg, self.label.as_ref().cloned())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use sha2::Sha256;
+
+        use crate::RsaPrivateKey;
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let encrypting_key = EncryptingKey::<Sha256>::new_with_label(
+            RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key").to_public_key(),
+            "label",
+        );
+
+        let ser_encrypting_key =
+            serde_json::to_string(&encrypting_key).expect("unable to serialize encrypting key");
+        let deser_encrypting_key = serde_json::from_str::<EncryptingKey<Sha256>>(&ser_encrypting_key)
+            .expect("unable to serialize encrypting key");
+
+        assert_eq!(encrypting_key.label, deser_encrypting_key.label);
+        assert_eq!(encrypting_key.inner, deser_encrypting_key.inner);
+    }
+}

Diff for: src/oaep/encrypting_key.rs

@@ -13,7 +13,7 @@ use zeroize::ZeroizeOnDrop;
 /// Decryption key for PKCS#1 v1.5 decryption as described in [RFC8017 § 7.2].
 ///
 /// [RFC8017 § 7.2]: https://datatracker.ietf.org/doc/html/rfc8017#section-7.2
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct DecryptingKey {
     inner: RsaPrivateKey,
@@ -52,3 +52,26 @@ impl EncryptingKeypair for DecryptingKey {
 }
 
 impl ZeroizeOnDrop for DecryptingKey {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use serde_test::{assert_tokens, Configure, Token};
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let decrypting_key = DecryptingKey::new(RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key"));
+
+        let tokens = [
+            Token::Struct { name: "DecryptingKey", len: 1 },
+            Token::Str("inner"),
+            Token::Str("3054020100300d06092a864886f70d01010105000440303e020100020900cc6c6130e35b46bf0203010001020863de1ac858580019020500f65cff5d020500d46b68cb02046d9a09f102047b4e3a4f020500f45065cc"),
+            Token::StructEnd,
+        ];
+        assert_tokens(&decrypting_key.clone().readable(), &tokens);
+    }
+}

Diff for: src/pkcs1v15/decrypting_key.rs

@@ -8,7 +8,7 @@ use rand_core::CryptoRngCore;
 /// Encryption key for PKCS#1 v1.5 encryption as described in [RFC8017 § 7.2].
 ///
 /// [RFC8017 § 7.2]: https://datatracker.ietf.org/doc/html/rfc8017#section-7.2
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct EncryptingKey {
     pub(super) inner: RsaPublicKey,
@@ -30,3 +30,27 @@ impl RandomizedEncryptor for EncryptingKey {
         encrypt(rng, &self.inner, msg)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use serde_test::{assert_tokens, Configure, Token};
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let priv_key = crate::RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key");
+        let encrypting_key = EncryptingKey::new(priv_key.to_public_key());
+
+        let tokens = [
+            Token::Struct { name: "EncryptingKey", len: 1 },
+            Token::Str("inner"),
+            Token::Str("3024300d06092a864886f70d01010105000313003010020900cc6c6130e35b46bf0203010001"),
+            Token::StructEnd,
+        ];
+        assert_tokens(&encrypting_key.clone().readable(), &tokens);
+    }
+}

Diff for: src/pkcs1v15/encrypting_key.rs

@@ -106,4 +106,24 @@ impl<'de> Deserialize<'de> for Signature {
             len: bytes.len(),
         })
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use serde_test::{assert_tokens, Configure, Token};
+        let signature = Signature {
+            inner: BigUint::new(Vec::from([42])),
+            len: 1,
+        };
+
+        let tokens = [
+            Token::Str("2a"),
+        ];
+        assert_tokens(&signature.readable(), &tokens);
+    }
 }

Diff for: src/pkcs1v15/signature.rs

@@ -289,3 +289,25 @@ where
         Self::try_from(pki).map_err(de::Error::custom)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use sha2::Sha256;
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let priv_key = crate::RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key");
+        let signing_key = SigningKey::<Sha256>::new(priv_key);
+
+        let ser_signing_key = serde_json::to_string(&signing_key).expect("unable to serialize signing key");
+        let deser_signing_key = serde_json::from_str::<SigningKey<Sha256>>(&ser_signing_key).expect("unable to deserialize signing key");
+        
+        assert_eq!(signing_key.inner, deser_signing_key.inner);
+        assert_eq!(signing_key.prefix, deser_signing_key.prefix);
+    }
+}

Diff for: src/pkcs1v15/signing_key.rs

@@ -15,7 +15,7 @@ use pkcs8::{
 use {
     pkcs8::SubjectPublicKeyInfo,
     serdect::serde::{de, ser, Deserialize, Serialize},
-    spki::der::Decode, 
+    spki::der::Decode,
 };
 
 use signature::{hazmat::PrehashVerifier, DigestVerifier, Verifier};
@@ -239,3 +239,28 @@ where
         Self::try_from(spki).map_err(de::Error::custom)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use sha2::Sha256;
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let priv_key = crate::RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key");
+        let pub_key = priv_key.to_public_key();
+        let verifying_key = VerifyingKey::<Sha256>::new(pub_key);
+
+        let ser_verifying_key =
+            serde_json::to_string(&verifying_key).expect("unable to serialize verifying key");
+        let deser_verifying_key = serde_json::from_str::<VerifyingKey<Sha256>>(&ser_verifying_key)
+            .expect("unable to deserialize verifying key");
+
+        assert_eq!(verifying_key.inner, deser_verifying_key.inner);
+        assert_eq!(verifying_key.prefix, deser_verifying_key.prefix);
+    }
+}

Diff for: src/pkcs1v15/verifying_key.rs

@@ -234,3 +234,24 @@ where
             .map(Self::new)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use sha2::Sha256;
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let signing_key = BlindedSigningKey::<Sha256>::new(RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key"));
+
+        let ser_signing_key = serde_json::to_string(&signing_key).expect("unable to serialize signing key");
+        let deser_signing_key = serde_json::from_str::<BlindedSigningKey<Sha256>>(&ser_signing_key).expect("unable to deserialize signing key");
+        
+        assert_eq!(signing_key.inner, deser_signing_key.inner);
+        assert_eq!(signing_key.salt_len, deser_signing_key.salt_len);
+    }
+}

Diff for: src/pss/blinded_signing_key.rs

@@ -100,4 +100,24 @@ impl<'de> Deserialize<'de> for Signature {
             len: bytes.len(),
         })
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use serde_test::{assert_tokens, Configure, Token};
+        let signature = Signature {
+            inner: BigUint::new(Vec::from([42])),
+            len: 1,
+        };
+
+        let tokens = [
+            Token::Str("2a"),
+        ];
+        assert_tokens(&signature.readable(), &tokens);
+    }
 }

Diff for: src/pss/signature.rs

@@ -257,3 +257,25 @@ where
             .map(Self::new)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_serde() {
+        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use sha2::Sha256;
+
+        let mut rng = ChaCha8Rng::from_seed([42; 32]);
+        let priv_key = crate::RsaPrivateKey::new(&mut rng, 64).expect("failed to generate key");
+        let signing_key = SigningKey::<Sha256>::new(priv_key);
+
+        let ser_signing_key = serde_json::to_string(&signing_key).expect("unable to serialize signing key");
+        let deser_signing_key = serde_json::from_str::<SigningKey<Sha256>>(&ser_signing_key).expect("unable to deserialize signing key");
+        
+        assert_eq!(signing_key.inner, deser_signing_key.inner);
+        assert_eq!(signing_key.salt_len, deser_signing_key.salt_len);
+    }
+}