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: 'database.hh'

#
#
# patch "database.hh"
#  from [504928c3ecaf2bec82d22528f2bf076597880780]
#    to [cdb13d34c338f3d6fb2e48840fd9c3a5b698cbcb]
#
============================================================
--- database.hh	504928c3ecaf2bec82d22528f2bf076597880780
+++ database.hh	cdb13d34c338f3d6fb2e48840fd9c3a5b698cbcb
@@ -231,15 +231,11 @@ public:

   void get_pubkey(id const & hash,
                   rsa_keypair_id & ident,
-                  base64<rsa_pub_key> & pub_encoded);
+                  rsa_pub_key & pub);

   void get_key(rsa_keypair_id const & ident, rsa_pub_key & pub);
-  void get_key(rsa_keypair_id const & ident,
-               base64<rsa_pub_key> & pub_encoded);
+  bool put_key(rsa_keypair_id const & ident, rsa_pub_key const & pub);

-  bool put_key(rsa_keypair_id const & ident,
-               base64<rsa_pub_key> const & pub_encoded);
-
   void delete_public_key(rsa_keypair_id const & pub_id);

   // Crypto operations
@@ -250,7 +246,7 @@ public:

   cert_status check_signature(rsa_keypair_id const & id,
                               std::string const & alleged_text,
-                              base64<rsa_sha1_signature> const & signature);
+                              rsa_sha1_signature const & signature);

   //
   // --== Certs ==--
@@ -278,18 +274,18 @@ public:

   // Only used by get_branch_certs (project.cc)
   outdated_indicator get_revision_certs(cert_name const & name,
-                          base64<cert_value> const & val,
+                          cert_value const & val,
                           std::vector< revision<cert> > & certs);

   // Only used by revision_is_in_branch (project.cc)
   outdated_indicator get_revision_certs(revision_id const & ident,
                           cert_name const & name,
-                          base64<cert_value> const & value,
+                          cert_value const & value,
                           std::vector< revision<cert> > & certs);

   // Only used by get_branch_heads (project.cc)
   outdated_indicator get_revisions_with_cert(cert_name const & name,
-                               base64<cert_value> const & value,
+                               cert_value const & value,
                                std::set<revision_id> & revisions);

   // Used through project.cc, and by