The unified diff between revisions [2df88abf..] and [818e3621..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'cmd_packet.cc'

#
#
# patch "cmd_packet.cc"
#  from [a0706ea1d4cbb5f9531ce639fd0c8003dde21100]
#    to [40b0b42404f7107752378b5c4b90298c352c091b]
#
============================================================
--- cmd_packet.cc	a0706ea1d4cbb5f9531ce639fd0c8003dde21100
+++ cmd_packet.cc	40b0b42404f7107752378b5c4b90298c352c091b
@@ -35,7 +35,7 @@ CMD(pubkey, "pubkey", "", CMD_REF(packet

   rsa_keypair_id ident(idx(args, 0)());
   bool exists(false);
-  base64< rsa_pub_key > key;
+  rsa_pub_key key;
   if (db.database_specified() && db.public_key_exists(ident))
     {
       db.get_key(ident, key);
@@ -124,7 +124,7 @@ namespace
     }

     virtual void consume_public_key(rsa_keypair_id const & ident,
-                                    base64< rsa_pub_key > const & k)
+                                    rsa_pub_key const & k)
     {
       transaction_guard guard(db);
       db.put_key(ident, k);
@@ -138,9 +138,9 @@ namespace
     }

     virtual void consume_old_private_key(rsa_keypair_id const & ident,
-                                         base64<old_arc4_rsa_priv_key> const & k)
+                                         old_arc4_rsa_priv_key const & k)
     {
-      base64<rsa_pub_key> dummy;
+      rsa_pub_key dummy;
       keys.migrate_old_key_pair(ident, k, dummy);
     }
   };