rpgp
diff --git a/‎src/packet/compressed_data.rs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/packet/compressed_data.rs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/packet/key/public.rs
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎src/packet/key/public.rs
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/packet/literal_data.rs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/packet/literal_data.rs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/packet/one_pass_signature.rs
Copy file name to clipboard
+7-9Lines changed: 7 additions & 9 deletions b/‎src/packet/one_pass_signature.rs
Copy file name to clipboard
+7-9Lines changed: 7 additions & 9 deletions
diff --git a/‎src/packet/public_key_encrypted_session_key.rs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎src/packet/public_key_encrypted_session_key.rs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/packet/signature/ser.rs
Copy file name to clipboard
+23-36Lines changed: 23 additions & 36 deletions b/‎src/packet/signature/ser.rs
Copy file name to clipboard
+23-36Lines changed: 23 additions & 36 deletions
diff --git a/‎src/packet/sym_encrypted_protected_data.rs
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions b/‎src/packet/sym_encrypted_protected_data.rs
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions
diff --git a/‎src/packet/sym_key_encrypted_session_key.rs
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions b/‎src/packet/sym_key_encrypted_session_key.rs
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions
diff --git a/‎src/packet/user_attribute.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/packet/user_attribute.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -1,5 +1,6 @@
 use std::io::{self, Read};
 
+use byteorder::WriteBytesExt;
 use flate2::read::{DeflateDecoder, ZlibDecoder};
 
 use crate::errors::Result;
@@ -80,7 +81,7 @@ impl CompressedData {
 
 impl Serialize for CompressedData {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
-        writer.write_all(&[u8::from(self.compression_algorithm)])?;
+        writer.write_u8(self.compression_algorithm.into())?;
         writer.write_all(&self.compressed_data)?;
 
         Ok(())
 
@@ -164,7 +164,7 @@ impl PubKeyInner {
             self.expiration
                 .expect("old key versions have an expiration"),
         )?;
-        writer.write_all(&[self.algorithm.into()])?;
+        writer.write_u8(self.algorithm.into())?;
         self.public_params.to_writer(writer)?;
 
         Ok(())
@@ -174,7 +174,7 @@ impl PubKeyInner {
         use crate::ser::Serialize;
 
         writer.write_u32::<BigEndian>(self.created_at.timestamp().try_into()?)?;
-        writer.write_all(&[self.algorithm.into()])?;
+        writer.write_u8(self.algorithm.into())?;
 
         let mut public_params = vec![];
         self.public_params.to_writer(&mut public_params)?;
@@ -231,7 +231,7 @@ impl crate::ser::Serialize for PublicSubkey {
 
 impl crate::ser::Serialize for PubKeyInner {
     fn to_writer<W: std::io::Write>(&self, writer: &mut W) -> Result<()> {
-        writer.write_all(&[u8::from(self.version)])?;
+        writer.write_u8(self.version.into())?;
 
         match self.version {
             KeyVersion::V2 | KeyVersion::V3 => self.to_writer_v2_v3(writer),
@@ -516,7 +516,7 @@ impl PublicKeyTrait for PubKeyInner {
             KeyVersion::V2 | KeyVersion::V3 | KeyVersion::V4 => {
                 // When a v4 signature is made over a key, the hash data starts with the octet 0x99,
                 // followed by a two-octet length of the key, and then the body of the key packet.
-                writer.write_all(&[0x99])?;
+                writer.write_u8(0x99)?;
                 writer.write_u16::<BigEndian>(key_buf.len().try_into()?)?;
             }
 
@@ -526,7 +526,7 @@ impl PublicKeyTrait for PubKeyInner {
 
                 // then octet 0x9B, followed by a four-octet length of the key,
                 // and then the body of the key packet.
-                writer.write_all(&[0x9b])?;
+                writer.write_u8(0x9b)?;
                 writer.write_u32::<BigEndian>(key_buf.len().try_into()?)?;
             }
 
 
@@ -122,7 +122,8 @@ impl AsRef<[u8]> for LiteralData {
 impl Serialize for LiteralData {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
         let name = &self.file_name;
-        writer.write_all(&[u8::from(self.mode), name.len().try_into()?])?;
+        writer.write_u8(self.mode.into())?;
+        writer.write_u8(name.len().try_into()?)?;
         writer.write_all(name)?;
         writer.write_u32::<BigEndian>(self.created.timestamp().try_into()?)?;
 
 
@@ -1,5 +1,6 @@
 use std::io;
 
+use byteorder::WriteBytesExt;
 use nom::bytes::streaming::take;
 use nom::combinator::{map, map_res};
 use nom::number::streaming::be_u8;
@@ -158,17 +159,14 @@ fn parse(packet_version: Version) -> impl Fn(&[u8]) -> IResult<&[u8], OnePassSig
 
 impl Serialize for OnePassSignature {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
-        writer.write_all(&[
-            self.version(),
-            self.typ.into(),
-            self.hash_algorithm.into(),
-            self.pub_algorithm.into(),
-        ])?;
+        writer.write_u8(self.version())?;
+        writer.write_u8(self.typ.into())?;
+        writer.write_u8(self.hash_algorithm.into())?;
+        writer.write_u8(self.pub_algorithm.into())?;
 
         // salt, if v6
         if let OpsVersionSpecific::V6 { salt, .. } = &self.version_specific {
-            let len: u8 = salt.len().try_into()?;
-            writer.write_all(&[len])?;
+            writer.write_u8(salt.len().try_into()?)?;
             writer.write_all(salt)?;
         }
 
@@ -180,7 +178,7 @@ impl Serialize for OnePassSignature {
                 writer.write_all(fingerprint.as_ref())?;
             }
         }
-        writer.write_all(&[self.last])?;
+        writer.write_u8(self.last)?;
 
         Ok(())
     }
 
@@ -138,9 +138,9 @@ fn parse(
 
 impl Serialize for PublicKeyEncryptedSessionKey {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
-        writer.write_all(&[self.version])?;
+        writer.write_u8(self.version)?;
         writer.write_all(self.id.as_ref())?;
-        writer.write_all(&[self.algorithm.into()])?;
+        writer.write_u8(self.algorithm.into())?;
 
         match self.algorithm {
             PublicKeyAlgorithm::RSA
@@ -160,7 +160,7 @@ impl Serialize for PublicKeyEncryptedSessionKey {
                     Some(l) => *l as usize,
                     None => 0,
                 };
-                writer.write_all(&[blen.try_into()?])?;
+                writer.write_u8(blen.try_into()?)?;
                 let padding_len = blen - self.mpis[2].as_bytes().len();
                 for _ in 0..padding_len {
                     writer.write_u8(0)?;
 
@@ -12,7 +12,7 @@ use crate::util::write_packet_length;
 
 impl Serialize for Signature {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
-        writer.write_all(&[u8::from(self.config.version())])?;
+        writer.write_u8(self.config.version().into())?;
 
         match self.config.version() {
             SignatureVersion::V2 | SignatureVersion::V3 => self.to_writer_v3(writer),
@@ -65,16 +65,14 @@ impl Subpacket {
                 writer.write_all(features)?;
             }
             SubpacketData::RevocationReason(code, reason) => {
-                writer.write_all(&[u8::from(*code)])?;
+                writer.write_u8((*code).into())?;
                 writer.write_all(reason)?;
             }
             SubpacketData::IsPrimary(is_primary) => {
-                let val = u8::from(*is_primary);
-                writer.write_all(&[val])?;
+                writer.write_u8((*is_primary).into())?;
             }
             SubpacketData::Revocable(is_revocable) => {
-                let val = u8::from(*is_revocable);
-                writer.write_all(&[val])?;
+                writer.write_u8((*is_revocable).into())?;
             }
             SubpacketData::EmbeddedSignature(inner_sig) => {
                 (*inner_sig).to_writer(writer)?;
@@ -94,7 +92,8 @@ impl Subpacket {
                 writer.write_all(&notation.value)?;
             }
             SubpacketData::RevocationKey(rev_key) => {
-                writer.write_all(&[rev_key.class as u8, rev_key.algorithm.into()])?;
+                writer.write_u8(rev_key.class as u8)?;
+                writer.write_u8(rev_key.algorithm.into())?;
                 writer.write_all(&rev_key.fingerprint[..])?;
             }
             SubpacketData::SignersUserID(body) => {
@@ -104,18 +103,18 @@ impl Subpacket {
                 writer.write_all(uri.as_bytes())?;
             }
             SubpacketData::TrustSignature(depth, value) => {
-                writer.write_all(&[*depth, *value])?;
+                writer.write_u8(*depth)?;
+                writer.write_u8(*value)?;
             }
             SubpacketData::RegularExpression(regexp) => {
                 writer.write_all(regexp)?;
             }
             SubpacketData::ExportableCertification(is_exportable) => {
-                let val = u8::from(*is_exportable);
-                writer.write_all(&[val])?;
+                writer.write_u8((*is_exportable).into())?;
             }
             SubpacketData::IssuerFingerprint(fp) => {
                 if let Some(version) = fp.version() {
-                    writer.write_all(&[u8::from(version)])?;
+                    writer.write_u8(version.into())?;
                     writer.write_all(fp.as_bytes())?;
                 } else {
                     bail!("IssuerFingerprint: needs versioned fingerprint")
@@ -126,7 +125,7 @@ impl Subpacket {
             }
             SubpacketData::IntendedRecipientFingerprint(fp) => {
                 if let Some(version) = fp.version() {
-                    writer.write_all(&[u8::from(version)])?;
+                    writer.write_u8(version.into())?;
                     writer.write_all(fp.as_bytes())?;
                 } else {
                     bail!("IntendedRecipientFingerprint: needs versioned fingerprint")
@@ -147,7 +146,8 @@ impl Subpacket {
                 writer.write_all(body)?;
             }
             SubpacketData::SignatureTarget(pub_alg, hash_alg, hash) => {
-                writer.write_all(&[u8::from(*pub_alg), u8::from(*hash_alg)])?;
+                writer.write_u8((*pub_alg).into())?;
+                writer.write_u8((*hash_alg).into())?;
                 writer.write_all(hash)?;
             }
         }
@@ -250,7 +250,7 @@ impl Subpacket {
 impl Serialize for Subpacket {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
         write_packet_length(1 + self.body_len()?, writer)?;
-        writer.write_all(&[self.typ().as_u8(self.is_critical)])?;
+        writer.write_u8(self.typ().as_u8(self.is_critical))?;
         self.body_to_writer(writer)?;
 
         Ok(())
@@ -260,12 +260,8 @@ impl Serialize for Subpacket {
 impl SignatureConfig {
     /// Serializes a v2 or v3 signature.
     fn to_writer_v3<W: io::Write>(&self, writer: &mut W) -> Result<()> {
-        writer.write_all(&[
-            // tag
-            0x05,
-            // type
-            self.typ.into(),
-        ])?;
+        writer.write_u8(0x05)?; // 1-octet length of the following hashed material; it MUST be 5
+        writer.write_u8(self.typ.into())?; // type
 
         if let SignatureVersionSpecific::V2 { created, issuer }
         | SignatureVersionSpecific::V3 { created, issuer } = &self.version_specific
@@ -276,26 +272,18 @@ impl SignatureConfig {
             bail!("expecting SignatureVersionSpecific::V3 for a v2/v3 signature")
         }
 
-        writer.write_all(&[
-            // public algorithm
-            u8::from(self.pub_alg),
-            // hash algorithm
-            u8::from(self.hash_alg),
-        ])?;
+        writer.write_u8(self.pub_alg.into())?; // public algorithm
+        writer.write_u8(self.hash_alg.into())?; // hash algorithm
 
         Ok(())
     }
 
     /// Serializes a v4 or v6 signature.
     fn to_writer_v4_v6<W: io::Write>(&self, writer: &mut W) -> Result<()> {
-        writer.write_all(&[
-            // type
-            self.typ.into(),
-            // public algorithm
-            u8::from(self.pub_alg),
-            // hash algorithm
-            u8::from(self.hash_alg),
-        ])?;
+        writer.write_u8(self.typ.into())?; // type
+
+        writer.write_u8(self.pub_alg.into())?; // public algorithm
+        writer.write_u8(self.hash_alg.into())?; // hash algorithm
 
         // hashed subpackets
         let mut hashed_subpackets = Vec::new();
@@ -360,8 +348,7 @@ impl Signature {
 
         // salt, if v6
         if let SignatureVersionSpecific::V6 { salt } = &self.config.version_specific {
-            let len: u8 = salt.len().try_into()?;
-            writer.write_all(&[len])?;
+            writer.write_u8(salt.len().try_into()?)?;
             writer.write_all(salt)?;
         }
 
 
@@ -1,5 +1,6 @@
 use std::io;
 
+use byteorder::WriteBytesExt;
 use log::debug;
 use nom::bytes::streaming::take;
 use nom::combinator::map_res;
@@ -209,7 +210,7 @@ impl Serialize for SymEncryptedProtectedData {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
         match &self.data {
             Data::V1 { data } => {
-                writer.write_all(&[0x01])?;
+                writer.write_u8(0x01)?;
                 writer.write_all(data)?;
             }
             Data::V2 {
@@ -219,8 +220,10 @@ impl Serialize for SymEncryptedProtectedData {
                 salt,
                 data,
             } => {
-                writer.write_all(&[0x02])?;
-                writer.write_all(&[(*sym_alg).into(), (*aead).into(), *chunk_size])?;
+                writer.write_u8(0x02)?;
+                writer.write_u8((*sym_alg).into())?;
+                writer.write_u8((*aead).into())?;
+                writer.write_u8(*chunk_size)?;
                 writer.write_all(salt)?;
                 writer.write_all(data)?;
             }
 
@@ -1,5 +1,6 @@
 use std::io;
 
+use byteorder::WriteBytesExt;
 use log::debug;
 use nom::bytes::streaming::take;
 use nom::combinator::map_res;
@@ -334,7 +335,8 @@ impl Serialize for SymKeyEncryptedSessionKey {
                 s2k,
                 encrypted_key,
             } => {
-                writer.write_all(&[0x04, u8::from(*sym_algorithm)])?;
+                writer.write_u8(0x04)?;
+                writer.write_u8((*sym_algorithm).into())?;
                 s2k.to_writer(writer)?;
                 if let Some(ref key) = encrypted_key {
                     writer.write_all(key)?;
@@ -349,7 +351,7 @@ impl Serialize for SymKeyEncryptedSessionKey {
                 auth_tag,
                 encrypted_key,
             } => {
-                writer.write_all(&[0x05])?;
+                writer.write_u8(0x05)?;
                 let mut first_buf = vec![u8::from(*sym_algorithm), u8::from(*aead)];
 
                 let mut buf = Vec::new();
@@ -358,7 +360,7 @@ impl Serialize for SymKeyEncryptedSessionKey {
                 first_buf.extend(buf);
                 first_buf.extend_from_slice(iv);
 
-                writer.write_all(&[first_buf.len().try_into()?])?;
+                writer.write_u8(first_buf.len().try_into()?)?;
                 writer.write_all(&first_buf)?;
 
                 writer.write_all(encrypted_key)?;
@@ -373,7 +375,7 @@ impl Serialize for SymKeyEncryptedSessionKey {
                 auth_tag,
                 encrypted_key,
             } => {
-                writer.write_all(&[0x06])?;
+                writer.write_u8(0x06)?;
                 let mut first_buf = vec![u8::from(*sym_algorithm), u8::from(*aead)];
 
                 let mut buf = Vec::new();
@@ -382,7 +384,7 @@ impl Serialize for SymKeyEncryptedSessionKey {
                 first_buf.extend(buf);
                 first_buf.extend_from_slice(iv);
 
-                writer.write_all(&[first_buf.len().try_into()?])?;
+                writer.write_u8(first_buf.len().try_into()?)?;
                 writer.write_all(&first_buf)?;
 
                 writer.write_all(encrypted_key)?;
 
@@ -189,15 +189,15 @@ impl Serialize for UserAttribute {
                 ..
             } => {
                 // typ: image
-                writer.write_all(&[0x01])?;
+                writer.write_u8(0x01)?;
                 writer.write_u16::<LittleEndian>((header.len() + 2).try_into()?)?;
                 writer.write_all(header)?;
 
                 // actual data
                 writer.write_all(data)?;
             }
             UserAttribute::Unknown { ref data, typ, .. } => {
-                writer.write_all(&[*typ])?;
+                writer.write_u8(*typ)?;
                 writer.write_all(data)?;
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -189,15 +189,15 @@ impl Serialize for UserAttribute {`
`189`	`189`	`..`
`190`	`190`	`} => {`
`191`	`191`	`// typ: image`
`192`		`- writer.write_all(&[0x01])?;`
	`192`	`+ writer.write_u8(0x01)?;`
`193`	`193`	`writer.write_u16::<LittleEndian>((header.len() + 2).try_into()?)?;`
`194`	`194`	`writer.write_all(header)?;`
`195`	`195`
`196`	`196`	`// actual data`
`197`	`197`	`writer.write_all(data)?;`
`198`	`198`	`}`
`199`	`199`	`UserAttribute::Unknown { ref data, typ, .. } => {`
`200`		`- writer.write_all(&[*typ])?;`
	`200`	`+ writer.write_u8(*typ)?;`
`201`	`201`	`writer.write_all(data)?;`
`202`	`202`	`}`
`203`	`203`	`}`