#
#
# patch "key_store.cc"
#  from [3174c4cba7768bc6ee96952a6c44ab6d53defa53]
#    to [be5b6947a5a6980e4adf48f23b22ba57984d43a2]
# 
# patch "netsync.cc"
#  from [46e2ca9ccd6699d8bd8bb16269b89d712f707503]
#    to [70fb360d4fc194115619a8323f01ee503cffd39f]
#
============================================================
--- key_store.cc	3174c4cba7768bc6ee96952a6c44ab6d53defa53
+++ key_store.cc	be5b6947a5a6980e4adf48f23b22ba57984d43a2
@@ -39,7 +39,7 @@ class key_store_state
   bool have_read;
   app_state & app;
   map<rsa_keypair_id, keypair> keys;
-  map<hexenc<id>, rsa_keypair_id> hashes;
+  map<id, rsa_keypair_id> hashes;
 
   // These are used to cache signers (if the hook allows).
   map<rsa_keypair_id,
============================================================
--- netsync.cc	46e2ca9ccd6699d8bd8bb16269b89d712f707503
+++ netsync.cc	70fb360d4fc194115619a8323f01ee503cffd39f
@@ -1366,18 +1366,14 @@ session::process_hello_cmd(rsa_keypair_i
       decode_base64(sig, sig_raw);
 
       // get the hash identifier for our pubkey
-      id our_key_hash;
-      key_hash_code(signing_key, our_kp.pub, our_key_hash);
+      base64<rsa_pub_key> our_pub;
+      db.get_key(signing_key, our_pub);
+      id our_key_hash_raw;
+      key_hash_code(signing_key, our_pub, our_key_hash_raw);
 
-      // make a signature
-      base64<rsa_sha1_signature> sig;
-      rsa_sha1_signature sig_raw;
-      make_signature(keys, db, signing_key, our_kp.priv, nonce(), sig);
-      decode_base64(sig, sig_raw);
-
       // make a new nonce of our own and send off the 'auth'
       queue_auth_cmd(this->role, our_include_pattern, our_exclude_pattern,
-                     our_key_hash, nonce, mk_nonce(), sig_raw(),
+                     our_key_hash_raw, nonce, mk_nonce(), sig_raw(),
                      their_key_encoded);
     }
   else