#
#
# patch "cmd_list.cc"
#  from [cb46f30508a10f3ccb9c85ca504ac7464d68b3ac]
#    to [d0eefab1596c776cc0d44416788c9714e50202c9]
# 
# patch "project.cc"
#  from [90c8988da88708a0c46d63603e4a551c3885c074]
#    to [610592860956824ead503ddc85844b9a8662c7f0]
# 
# patch "tests/key_files_created_securely/__driver__.lua"
#  from [c1e2b815fcc95a7ecda0d30f68156af8e8049c92]
#    to [e4e15e30715504a2eac0ef5b4fc5e83a4815931f]
#
============================================================
--- cmd_list.cc	cb46f30508a10f3ccb9c85ca504ac7464d68b3ac
+++ cmd_list.cc	d0eefab1596c776cc0d44416788c9714e50202c9
@@ -372,7 +372,9 @@ CMD(keys, "keys", "", CMD_REF(list), "[P
         }
       seen_aliases.insert(alias);
 
-      string rendered_basic = id.inner()() + string(" ") + alias;
+      hexenc< ::id> hid;
+      encode_hexenc(id.inner(), hid);
+      string rendered_basic = hid() + string(" ") + alias;
       if (given_name != alias)
         {
           rendered_basic += string(" (") + given_name + string(")");
@@ -385,7 +387,7 @@ CMD(keys, "keys", "", CMD_REF(list), "[P
               idx(public_locations, 0) == "keystore")
             {
               have_keystore_only_key = true;
-              rendered_basic += "   (*)";
+              rendered += "   (*)";
             }
           public_rendered.insert(make_pair(alias, rendered));
         }
============================================================
--- project.cc	90c8988da88708a0c46d63603e4a551c3885c074
+++ project.cc	610592860956824ead503ddc85844b9a8662c7f0
@@ -567,6 +567,9 @@ project_t::complete_key_identity(key_sto
                                  lua_hooks & lua,
                                  key_identity_info & info)
 {
+  MM(info.id);
+  MM(info.official_name);
+  MM(info.given_name);
   if (!info.id.inner()().empty())
     {
       get_canonical_name_of_key(keys, info.id, info.given_name);
============================================================
--- tests/key_files_created_securely/__driver__.lua	c1e2b815fcc95a7ecda0d30f68156af8e8049c92
+++ tests/key_files_created_securely/__driver__.lua	e4e15e30715504a2eac0ef5b4fc5e83a4815931f
@@ -18,5 +18,11 @@ check({ "sh", "-c", "umask 0000; exec" .
 check({ "sh", "-c", "umask 0000; exec" .. cmd },
       0, false, false, string.rep("foobar\n", 2))
 
-check({ "ls", "-l", "keys/foobar" }, 0, true, nil)
-check(qgrep("^-rw------- .*keys/foobar", "stdout"))
+check(mtn("ls", "keys"), 0, true)
+check(grep(" foobar$", "stdout"), 0, true)
+
+line = readfile("stdout")
+keyid = string.sub(line, 0, 40)
+
+check({ "ls", "-l", "keys/" .. keyid }, 0, true, nil)
+check(qgrep("^-rw------- .*keys/" .. keyid, "stdout"))