Commits

Kristian Fiskerstrand committed 8afa87f

Changelog

Comments (0)

Files changed (5)

 # HG changeset patch
 # Parent 3c75386bc7ce409eca4a4629b4b14b252a8808e8
-Add metadata information to key dump
+Add metadata information (number of keys, number of files,
 
 diff -r 3c75386bc7ce CHANGELOG
 --- a/CHANGELOG	Sat Oct 27 23:15:53 2012 +0200
-+++ b/CHANGELOG	Thu Nov 08 15:39:33 2012 +0100
-@@ -3,6 +3,7 @@
++++ b/CHANGELOG	Fri Nov 09 15:00:05 2012 +0100
+@@ -3,6 +3,10 @@
      from self-signatures on the key's UIDs. In addition, instead of 8-digit
      key IDs, index entries now return the most specific key ID possible:
      16-digit key ID for V3 keys, and the full fingerprint for V4 keys.
-+  - Add metadata information to key dump 
++  - Add metadata information (number of keys, number of files, 
++    checksums, etc) to key dump. This allows for information on the
++    key dump ahead of download/import, and direct verification of checksums
++    using md5sum -c <metadata-file>.  
  
  1.1.4
    - Fix X-HKP-Results-Count so that limit=0 returns no results, but include
 diff -r 3c75386bc7ce sksdump.ml
 --- a/sksdump.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/sksdump.ml	Thu Nov 08 15:39:33 2012 +0100
++++ b/sksdump.ml	Fri Nov 09 15:00:05 2012 +0100
 @@ -80,9 +80,40 @@
      let file = open_out fname in
      protect ~f:(fun () -> write_to_file size stream file)

MultiSearch

-# HG changeset patch
-# Parent 3c75386bc7ce409eca4a4629b4b14b252a8808e8

SubkeySignature

-# HG changeset patch
-# User kristianf
-# Date 1343695980 -3600
-# Node ID b436e48dd8e08c247b841c5460786655d3e148bf
-# Parent a66d15563b192757c7b04c1303015cabe5d1b722
-Restrict signatures on subkey to 0x18 and 0x28
-
-diff -r f4bd162e1cea -r b436e48dd8e0 fixkey.ml
---- a/fixkey.ml	Sun Jul 29 20:23:32 2012 +0100
-+++ b/fixkey.ml	Tue Jul 31 01:53:00 2012 +0100
-@@ -129,6 +129,16 @@
-   try ignore (ParsePGP.parse_signature pack); true
-   with e -> false
- 
-+let good_subkey_signature pack =
-+   let checksig = ParsePGP.parse_signature pack in
-+   let result = match checksig with 
-+    | V3sig s -> false
-+    | V4sig s -> match (int_to_sigtype s.v4s_sigtype) with 
-+        | Subkey_Binding_Signature | Subkey_revocation_signature -> true
-+        | _ -> false
-+   in 
-+   result
-+  
- let drop_bad_sigs packlist =
-   List.filter ~f:good_signature packlist
- 
-@@ -137,13 +147,18 @@
-   if sigs = [] then None
-   else Some (pack,sigs)
- 
-+let subkey_sig_filter_sigpair (pack,sigs) =
-+  let sigs = List.filter ~f:good_subkey_signature sigs in
-+  if sigs = [] then None
-+  else Some (pack,sigs)
-+  
- let presentation_filter key =
-   let pkey = key_to_pkey key in
-   if not (good_key pkey.key)
-   then None
-   else
-     let selfsigs = drop_bad_sigs pkey.selfsigs in
--    let subkeys = Utils.filter_map ~f:sig_filter_sigpair pkey.subkeys in
-+    let subkeys = Utils.filter_map ~f:subkey_sig_filter_sigpair pkey.subkeys in
-     let uids = Utils.filter_map ~f:sig_filter_sigpair pkey.uids in
-     let subkeys = List.filter ~f:(fun (key,_) -> good_key key) subkeys in
-     Some (flatten { pkey with

Use Long KeyID

-# 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
 DUMP_METADATA
-MultiSearch
 CleanOption
 #KeyExpirationTime
-Use Long KeyID
-SubkeySignature
 # Placed by Bitbucket