Merge pull request #8 from baloo/baloo/extension-serialization

extension: fixup ExtensionContents serialization

src/proto/mod.rs

@@ -24,6 +24,8 @@ pub use self::signature::*;
 
 use serde::{Deserialize, Serialize};
 
+pub type MpInt = Vec<u8>;
+
 pub trait Blob: Sized {
     fn to_blob(&self) -> ProtoResult<Vec<u8>>;
     fn from_blob(blob: &[u8]) -> ProtoResult<Self>;

src/proto/private_key.rs

@@ -1,11 +1,10 @@
 use super::error::ProtoError;
 use super::key_type::{KeyType, KeyTypeEnum};
+use super::MpInt;
 use serde::de::{Deserializer, Error};
 use serde::ser::{SerializeTuple, Serializer};
 use serde::{Deserialize, Serialize};
 
-pub type MpInt = Vec<u8>;
-
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct DssPrivateKey {
     pub p: MpInt,

src/proto/public_key.rs

@@ -1,12 +1,11 @@
 use super::error::ProtoError;
 use super::key_type::{KeyType, KeyTypeEnum};
 use super::private_key::*;
+use super::MpInt;
 use serde::de::{Deserializer, Error};
 use serde::ser::{SerializeTuple, Serializer};
 use serde::{Deserialize, Serialize};
 
-pub type MpInt = Vec<u8>;
-
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct RsaPublicKey {
     pub e: MpInt,

src/proto/ser.rs

@@ -76,11 +76,11 @@ impl<'a, W: io::Write> ser::Serializer for &'a mut Serializer<W> {
     }
 
     fn serialize_str(self, v: &str) -> ProtoResult<()> {
+        (v.len() as u32).serialize(&mut *self)?;
         self.serialize_bytes(v.as_bytes())
     }
 
     fn serialize_bytes(self, v: &[u8]) -> ProtoResult<()> {
-        (v.len() as u32).serialize(&mut *self)?;
         self.writer.write_all(v).map_err(Into::into)
     }
 

src/proto/tests/mod.rs

@@ -176,4 +176,6 @@ fn test_extension() {
     ];
     let extension: Extension = from_bytes(extension_bytes).unwrap();
     assert_eq!(extension.extension_type, "[email protected]");
+    let out = to_bytes(&extension).unwrap();
+    assert_eq!(extension_bytes, out);
 }