#
#
# patch "cmd_key_cert.cc"
#  from [bd48fabfc581ee8ed2ca9848847fd4b85fcab560]
#    to [c414f02e76960c3ae07d13530e79e543162e1411]
# 
# patch "key_store.cc"
#  from [7d27913e6a308894dd2215180b6d3939d69ad10a]
#    to [e247097917780f0374ac16fd8da96ecf8127ef3c]
# 
# patch "key_store.hh"
#  from [da7c45118bd7a32dacff7e877c5e71a14024e3d6]
#    to [f760b7851e00b85d3289fd11774828f7bd3b1720]
#
============================================================
--- cmd_key_cert.cc	bd48fabfc581ee8ed2ca9848847fd4b85fcab560
+++ cmd_key_cert.cc	c414f02e76960c3ae07d13530e79e543162e1411
@@ -17,6 +17,7 @@
 #include "cmd.hh"
 #include "app_state.hh"
 #include "keys.hh"
+#include "transforms.hh"
 
 using std::cout;
 using std::ostream_iterator;
@@ -177,9 +178,9 @@ CMD(trusted, "trusted", "", CMD_REF(key_
   expand_selector(app, idx(args, 0)(), rids);
   diagnose_ambiguous_expansion(app, idx(args, 0)(), rids);
 
-  hexenc<id> ident;
+  revision_id ident;
   if (!rids.empty())
-    ident = hexenc<id>(encode_hexenc(rids.begin()->inner()()));
+    ident = *rids.begin();
 
   cert_name cname;
   internalize_cert_name(idx(args, 1), cname);
@@ -208,7 +209,7 @@ CMD(trusted, "trusted", "", CMD_REF(key_
             "and value: %s\n"
             "was signed by: %s\n"
             "it would be: %s")
-    % ident
+    % encode_hexenc(ident.inner()())
     % cname
     % value
     % all_signers.str()
============================================================
--- key_store.cc	7d27913e6a308894dd2215180b6d3939d69ad10a
+++ key_store.cc	e247097917780f0374ac16fd8da96ecf8127ef3c
@@ -343,8 +343,8 @@ key_store::create_key_pair(database & db
 key_store::create_key_pair(database & db,
                            rsa_keypair_id const & id,
                            utf8 const * maybe_passphrase,
-                           hexenc<id> * maybe_pubhash,
-                           hexenc<id> * maybe_privhash)
+                           id * maybe_pubhash,
+                           id * maybe_privhash)
 {
   conditional_transaction_guard guard(db);
 
============================================================
--- key_store.hh	da7c45118bd7a32dacff7e877c5e71a14024e3d6
+++ key_store.hh	f760b7851e00b85d3289fd11774828f7bd3b1720
@@ -57,8 +57,8 @@ public:
 
   void create_key_pair(database & db, rsa_keypair_id const & id,
                        utf8 const * maybe_passphrase = NULL,
-                       hexenc<id> * maybe_pubhash = NULL,
-                       hexenc<id> * maybe_privhash = NULL);
+                       id * maybe_pubhash = NULL,
+                       id * maybe_privhash = NULL);
 
   void change_key_passphrase(rsa_keypair_id const & id);