net: Fix sending keys to servers.

  - Now that TPKs can be serialized, KeyServer::send can get actual
    TPKs to send.

1 files changed, 9 insertions, 5 deletions

diff --git a/net/src/lib.rs b/net/src/lib.rs
index bab1b8ff..f93608fe 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -181,15 +181,19 @@ impl KeyServer {
     }
 
     /// Sends the given key to the server.
-    ///
-    /// XXX: This should take a &TPK, but TPKs cannot be serialized at
-    /// the moment.
-    pub fn send(&mut self, key: &[u8]) -> Result<()> {
+    pub fn send(&mut self, key: &TPK) -> Result<()> {
+        use openpgp::armor::{Writer, Kind};
+
         let uri = format!("{}/pks/add", self.uri).parse()?;
+        let mut armored_blob = vec![];
+        {
+            let mut w = Writer::new(&mut armored_blob, Kind::PublicKey);
+            key.serialize(&mut w)?;
+        }
 
         // Prepare to send url-encoded data.
         let mut post_data = b"keytext=".to_vec();
-        post_data.extend_from_slice(percent_encode(key, KEYSERVER_ENCODE_SET)
+        post_data.extend_from_slice(percent_encode(&armored_blob, KEYSERVER_ENCODE_SET)
                                     .collect::<String>().as_bytes());
 
         let mut request = Request::new(Method::Post, uri);