padding: ensure PaddingScheme is Send and Sync (#215)

It's more convenient for users. Fix #214
RustCrypto · Oct 24, 2022 · a857c8f · a857c8f
1 parent 942571f
commit a857c8f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/key.rs b/src/key.rs
@@ -930,7 +930,9 @@ mod tests {
         }
     }
 
-    fn do_test_encrypt_decrypt_oaep<D: 'static + Digest + DynDigest>(prk: &RsaPrivateKey) {
+    fn do_test_encrypt_decrypt_oaep<D: 'static + Digest + DynDigest + Send + Sync>(
+        prk: &RsaPrivateKey,
+    ) {
         let mut rng = ChaCha8Rng::from_seed([42; 32]);
 
         let k = prk.size();
@@ -974,8 +976,8 @@ mod tests {
     }
 
     fn do_test_oaep_with_different_hashes<
-        D: 'static + Digest + DynDigest,
-        U: 'static + Digest + DynDigest,
+        D: 'static + Digest + DynDigest + Send + Sync,
+        U: 'static + Digest + DynDigest + Send + Sync,
     >(
         prk: &RsaPrivateKey,
     ) {

diff --git a/src/padding.rs b/src/padding.rs
@@ -27,13 +27,13 @@ pub enum PaddingScheme {
     /// A prominent example is the [`AndroidKeyStore`](https://developer.android.com/guide/topics/security/cryptography#oaep-mgf1-digest).
     /// It uses SHA-1 for `mgf_digest` and a user-chosen SHA flavour for `digest`.
     OAEP {
-        digest: Box<dyn DynDigest>,
-        mgf_digest: Box<dyn DynDigest>,
+        digest: Box<dyn DynDigest + Send + Sync>,
+        mgf_digest: Box<dyn DynDigest + Send + Sync>,
         label: Option<String>,
     },
     /// Sign and Verify using PSS padding.
     PSS {
-        digest: Box<dyn DynDigest>,
+        digest: Box<dyn DynDigest + Send + Sync>,
         salt_len: Option<usize>,
     },
 }
@@ -98,8 +98,8 @@ impl PaddingScheme {
     /// let encrypted_data = key.encrypt(&mut rng, padding, b"secret").unwrap();
     /// ```
     pub fn new_oaep_with_mgf_hash<
-        T: 'static + Digest + DynDigest,
-        U: 'static + Digest + DynDigest,
+        T: 'static + Digest + DynDigest + Send + Sync,
+        U: 'static + Digest + DynDigest + Send + Sync,
     >() -> Self {
         PaddingScheme::OAEP {
             digest: Box::new(T::new()),
@@ -125,7 +125,7 @@ impl PaddingScheme {
     /// let padding = PaddingScheme::new_oaep::<Sha256>();
     /// let encrypted_data = key.encrypt(&mut rng, padding, b"secret").unwrap();
     /// ```
-    pub fn new_oaep<T: 'static + Digest + DynDigest>() -> Self {
+    pub fn new_oaep<T: 'static + Digest + DynDigest + Send + Sync>() -> Self {
         PaddingScheme::OAEP {
             digest: Box::new(T::new()),
             mgf_digest: Box::new(T::new()),
@@ -135,8 +135,8 @@ impl PaddingScheme {
 
     /// Create a new OAEP `PaddingScheme` with an associated `label`, using `T` as the hash function for the label, and `U` as the hash function for MGF1.
     pub fn new_oaep_with_mgf_hash_with_label<
-        T: 'static + Digest + DynDigest,
-        U: 'static + Digest + DynDigest,
+        T: 'static + Digest + DynDigest + Send + Sync,
+        U: 'static + Digest + DynDigest + Send + Sync,
         S: AsRef<str>,
     >(
         label: S,
@@ -149,22 +149,24 @@ impl PaddingScheme {
     }
 
     /// Create a new OAEP `PaddingScheme` with an associated `label`, using `T` as the hash function for both the label and for MGF1.
-    pub fn new_oaep_with_label<T: 'static + Digest + DynDigest, S: AsRef<str>>(label: S) -> Self {
+    pub fn new_oaep_with_label<T: 'static + Digest + DynDigest + Send + Sync, S: AsRef<str>>(
+        label: S,
+    ) -> Self {
         PaddingScheme::OAEP {
             digest: Box::new(T::new()),
             mgf_digest: Box::new(T::new()),
             label: Some(label.as_ref().to_string()),
         }
     }
 
-    pub fn new_pss<T: 'static + Digest + DynDigest>() -> Self {
+    pub fn new_pss<T: 'static + Digest + DynDigest + Send + Sync>() -> Self {
         PaddingScheme::PSS {
             digest: Box::new(T::new()),
             salt_len: None,
         }
     }
 
-    pub fn new_pss_with_salt<T: 'static + Digest + DynDigest>(len: usize) -> Self {
+    pub fn new_pss_with_salt<T: 'static + Digest + DynDigest + Send + Sync>(len: usize) -> Self {
         PaddingScheme::PSS {
             digest: Box::new(T::new()),
             salt_len: Some(len),