Source

sks-keyserver-patches / Use Long KeyID

Full commit
# HG changeset patch
# Parent e2d4ec6c214703fed821847dea84349edeabf48b

diff -r e2d4ec6c2147 index.ml
--- a/index.ml	Fri Aug 10 20:50:24 2012 +0200
+++ b/index.ml	Tue Aug 14 22:29:22 2012 +0200
@@ -295,13 +295,12 @@
 
   let keyid_string = match siginfo.keyid with
     | Some keyid ->
-        let short = Fingerprint.keyid_to_string ~short:true keyid in
         let long = Fingerprint.keyid_to_string ~short:false keyid in
         let link =
           HtmlTemplates.link ~op:"get"
             ~hash:request.hash ~fingerprint:request.fingerprint ~keyid:long
         in
-        sprintf "<a href=\"%s\">%s</a>" link short
+        sprintf "<a href=\"%s\">%s</a>" link long
     | None ->
         "no keyid"
   in
@@ -395,16 +394,14 @@
             datestr_of_int64 time
   in
   let keyid = keyid in
-  let keyid_short = Fingerprint.keyid_to_string ~short:true keyid in
   let keyid_long = Fingerprint.keyid_to_string ~short:false keyid in
-
   let keyid_string =
-    if is_subkey then sprintf "%8s" keyid_short
+    if is_subkey then sprintf "%16s" keyid_long
     else
-      sprintf "<a href=\"%s\">%8s</a>"
+      sprintf "<a href=\"%s\">%16s</a>"
         (HtmlTemplates.link ~op:"get" ~hash:false ~fingerprint:false
-           ~keyid:keyid_long )
-        keyid_short
+           ~keyid:keyid_long)
+        keyid_long
   in
   let algo = pk_alg_to_ident pki.pk_alg in
   let line = sprintf "%s  %4d%s/%s %s %s "
diff -r e2d4ec6c2147 mRindex.ml
--- a/mRindex.ml	Fri Aug 10 20:50:24 2012 +0200
+++ b/mRindex.ml	Tue Aug 14 22:29:22 2012 +0200
@@ -99,7 +99,7 @@
 
 let key_to_lines key =
   let full_keyid = Fingerprint.keyid_from_key ~short:false key in
-  let keyid = Fingerprint.keyid_to_string ~short:true full_keyid in
+  let keyid = Fingerprint.keyid_to_string ~short:false full_keyid in
   let pkey = KeyMerge.key_to_pkey key in
   let key_packet = pkey.KeyMerge.key in
   let pki = ParsePGP.parse_pubkey_info key_packet in