diff options
Diffstat (limited to 'openpgp/src/crypto')
-rw-r--r-- | openpgp/src/crypto/aead.rs | 2 | ||||
-rw-r--r-- | openpgp/src/crypto/asymmetric.rs | 2 | ||||
-rw-r--r-- | openpgp/src/crypto/mem.rs | 2 | ||||
-rw-r--r-- | openpgp/src/crypto/mod.rs | 4 | ||||
-rw-r--r-- | openpgp/src/crypto/mpi.rs | 14 | ||||
-rw-r--r-- | openpgp/src/crypto/s2k.rs | 2 | ||||
-rw-r--r-- | openpgp/src/crypto/symmetric.rs | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs index ed773b7d..2544f6c8 100644 --- a/openpgp/src/crypto/aead.rs +++ b/openpgp/src/crypto/aead.rs @@ -544,7 +544,7 @@ pub struct Encryptor<W: io::Write> { // A place to write encrypted data into. scratch: Vec<u8>, } -assert_send_and_sync!{Encryptor<W>, W: io::Write} +assert_send_and_sync!(Encryptor<W>, W: io::Write); impl<W: io::Write> Encryptor<W> { /// Instantiate a new AEAD encryptor. diff --git a/openpgp/src/crypto/asymmetric.rs b/openpgp/src/crypto/asymmetric.rs index 55b24d7d..3e5b5ddd 100644 --- a/openpgp/src/crypto/asymmetric.rs +++ b/openpgp/src/crypto/asymmetric.rs @@ -137,7 +137,7 @@ pub struct KeyPair { public: Key<key::PublicParts, key::UnspecifiedRole>, secret: packet::key::Unencrypted, } -assert_send_and_sync!{KeyPair} +assert_send_and_sync!(KeyPair); impl KeyPair { /// Creates a new key pair. diff --git a/openpgp/src/crypto/mem.rs b/openpgp/src/crypto/mem.rs index ea135a24..59056cac 100644 --- a/openpgp/src/crypto/mem.rs +++ b/openpgp/src/crypto/mem.rs @@ -218,7 +218,7 @@ pub struct Encrypted { ciphertext: Protected, iv: Protected, } -assert_send_and_sync!{Encrypted} +assert_send_and_sync!(Encrypted); impl PartialEq for Encrypted { fn eq(&self, other: &Self) -> bool { diff --git a/openpgp/src/crypto/mod.rs b/openpgp/src/crypto/mod.rs index 5193fcca..591d2c6f 100644 --- a/openpgp/src/crypto/mod.rs +++ b/openpgp/src/crypto/mod.rs @@ -48,7 +48,7 @@ pub(crate) mod symmetric; /// [`From`]: https://doc.rust-lang.org/std/convert/trait.From.html #[derive(Clone, PartialEq, Eq)] pub struct SessionKey(mem::Protected); -assert_send_and_sync!{SessionKey} +assert_send_and_sync!(SessionKey); impl SessionKey { /// Creates a new session key. @@ -171,7 +171,7 @@ impl fmt::Debug for SessionKey { /// ``` #[derive(Clone, PartialEq, Eq)] pub struct Password(mem::Encrypted); -assert_send_and_sync!{Password} +assert_send_and_sync!(Password); impl From<Vec<u8>> for Password { fn from(v: Vec<u8>) -> Self { diff --git a/openpgp/src/crypto/mpi.rs b/openpgp/src/crypto/mpi.rs index 541fd3b5..3fe7aa7b 100644 --- a/openpgp/src/crypto/mpi.rs +++ b/openpgp/src/crypto/mpi.rs @@ -43,7 +43,7 @@ pub struct MPI { /// Integer value as big-endian with leading zeros stripped. value: Box<[u8]>, } -assert_send_and_sync!{MPI} +assert_send_and_sync!(MPI); impl From<Vec<u8>> for MPI { fn from(v: Vec<u8>) -> Self { @@ -297,7 +297,7 @@ pub struct ProtectedMPI { /// Integer value as big-endian. value: Protected, } -assert_send_and_sync!{ProtectedMPI} +assert_send_and_sync!(ProtectedMPI); impl From<Vec<u8>> for ProtectedMPI { fn from(m: Vec<u8>) -> Self { @@ -506,7 +506,7 @@ pub enum PublicKey { rest: Box<[u8]>, }, } -assert_send_and_sync!{PublicKey} +assert_send_and_sync!(PublicKey); impl PublicKey { /// Returns the length of the public key in bits. @@ -667,7 +667,7 @@ pub enum SecretKeyMaterial { rest: Protected, }, } -assert_send_and_sync!{SecretKeyMaterial} +assert_send_and_sync!(SecretKeyMaterial); impl fmt::Debug for SecretKeyMaterial { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -868,7 +868,7 @@ pub enum SecretKeyChecksum { /// Sum of the decrypted secret key octets modulo 65536. Sum16, } -assert_send_and_sync!{SecretKeyChecksum} +assert_send_and_sync!(SecretKeyChecksum); impl Default for SecretKeyChecksum { fn default() -> Self { @@ -918,7 +918,7 @@ pub enum Ciphertext { rest: Box<[u8]>, }, } -assert_send_and_sync!{Ciphertext} +assert_send_and_sync!(Ciphertext); impl Ciphertext { /// Returns, if known, the public-key algorithm for this @@ -1029,7 +1029,7 @@ pub enum Signature { rest: Box<[u8]>, }, } -assert_send_and_sync!{Signature} +assert_send_and_sync!(Signature); impl Hash for Signature { fn hash(&self, mut hash: &mut dyn hash::Digest) { diff --git a/openpgp/src/crypto/s2k.rs b/openpgp/src/crypto/s2k.rs index 18472554..eae95b90 100644 --- a/openpgp/src/crypto/s2k.rs +++ b/openpgp/src/crypto/s2k.rs @@ -114,7 +114,7 @@ pub enum S2K { parameters: Option<Box<[u8]>>, }, } -assert_send_and_sync!{S2K} +assert_send_and_sync!(S2K); impl Default for S2K { fn default() -> Self { diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs index a364ba53..0030b2d4 100644 --- a/openpgp/src/crypto/symmetric.rs +++ b/openpgp/src/crypto/symmetric.rs @@ -51,7 +51,7 @@ pub struct Decryptor<R: io::Read> { // Up to a block of unread data. buffer: Vec<u8>, } -assert_send_and_sync!{Decryptor<R>, R: io::Read} +assert_send_and_sync!(Decryptor<R>, R: io::Read); impl<R: io::Read> Decryptor<R> { /// Instantiate a new symmetric decryptor. `reader` is the source @@ -318,7 +318,7 @@ pub struct Encryptor<W: io::Write> { // A place to write encrypted data into. scratch: Vec<u8>, } -assert_send_and_sync!{Encryptor<W>, W: io::Write} +assert_send_and_sync!(Encryptor<W>, W: io::Write); impl<W: io::Write> Encryptor<W> { /// Instantiate a new symmetric encryptor. |