Commits

Kristian Fiskerstrand committed 154f1f8

Add another cacert cert

  • Participants
  • Parent commits 337d76c

Comments (0)

Files changed (3)

 # HG changeset patch
-# Parent 3c75386bc7ce409eca4a4629b4b14b252a8808e8
+# Parent 5a15aab0027ae1686cad4be1d458d1b8e1017994
 
-diff -r 3c75386bc7ce CHANGELOG
---- a/CHANGELOG	Sat Oct 27 23:15:53 2012 +0200
-+++ b/CHANGELOG	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a CHANGELOG
+--- a/CHANGELOG	Sun Oct 28 21:50:46 2012 +0100
++++ b/CHANGELOG	Sun Oct 28 21:59:11 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:
  
  1.1.4
    - Fix X-HKP-Results-Count so that limit=0 returns no results, but include
-diff -r 3c75386bc7ce Makefile
---- a/Makefile	Sat Oct 27 23:15:53 2012 +0200
-+++ b/Makefile	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a Makefile
+--- a/Makefile	Sun Oct 28 21:50:46 2012 +0100
++++ b/Makefile	Sun Oct 28 21:59:11 2012 +0100
 @@ -80,11 +80,11 @@
  ROBJS=$(ROBJS.bc:.cmo=.cmx)
  
  	sendmail.cmo recvmail.cmo mailsync.cmo \
  	clean_keydb.cmo build.cmo fastbuild.cmo pbuild.cmo merge_keyfiles.cmo \
  	sksdump.cmo incdump.cmo dbserver.cmo reconComm.cmo recoverList.cmo \
-diff -r 3c75386bc7ce dbserver.ml
---- a/dbserver.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/dbserver.ml	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a dbserver.ml
+--- a/dbserver.ml	Sun Oct 28 21:50:46 2012 +0100
++++ b/dbserver.ml	Sun Oct 28 21:59:11 2012 +0100
 @@ -170,7 +170,13 @@
    (** returns list of keys readied for presentation *)
    let clean_keys request keys =
                    None -> raise (Wserver.Misc_error "No valid key found for hash")
                  | Some key -> key
              else key
-diff -r 3c75386bc7ce fixkey.ml
---- a/fixkey.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/fixkey.ml	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a fixkey.ml
+--- a/fixkey.ml	Sun Oct 28 21:50:46 2012 +0100
++++ b/fixkey.ml	Sun Oct 28 21:59:11 2012 +0100
 @@ -24,6 +24,7 @@
  open MoreLabels
  open Common
  
  module Map = PMap.Map
  
-@@ -144,29 +145,86 @@
+@@ -144,29 +145,87 @@
    try ignore (ParsePGP.parse_pubkey_info pack); true
    with e -> false
  
 + let siginfo = sig_to_siginfo pack in
 + let robo_signers = ["9710B89BCA57AD7C"; (* PGP Global Directory *)
 +                     "D2BB0D0165D0FD58"; (* CA Cert *)
++                     "77AE7F129E2BD1F2"; (* CA Cert Low security *)
 +                     "6EA7FB4DE0BB4BCD"; (* Tele.Ring Robo CA *)
 +                     "10581685C521097E"] in (* Toehold robot CA *)
 + match siginfo.keyid with
 + 
 +let presentation_filter_wrapper_no_extended_clean key =
 + presentation_filter false key
-diff -r 3c75386bc7ce fixkey.mli
---- a/fixkey.mli	Sat Oct 27 23:15:53 2012 +0200
-+++ b/fixkey.mli	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a fixkey.mli
+--- a/fixkey.mli	Sun Oct 28 21:50:46 2012 +0100
++++ b/fixkey.mli	Sun Oct 28 21:59:11 2012 +0100
 @@ -15,4 +15,8 @@
  val drop_bad_sigs : Packet.packet list -> Packet.packet list
  val sig_filter_sigpair :
 +val presentation_filter_wrapper_no_extended_clean :
 +  Packet.packet list -> Packet.packet list option
 +
-diff -r 3c75386bc7ce index.ml
---- a/index.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/index.ml	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a index.ml
+--- a/index.ml	Sun Oct 28 21:50:46 2012 +0100
++++ b/index.ml	Sun Oct 28 21:59:11 2012 +0100
 @@ -27,40 +27,12 @@
  open Packet
  open Request
  (** sort signatures in ascending time order *)
  let sort_siginfo_list list =
    List.stable_sort list
-diff -r 3c75386bc7ce index.mli
---- a/index.mli	Sat Oct 27 23:15:53 2012 +0200
-+++ b/index.mli	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a index.mli
+--- a/index.mli	Sun Oct 28 21:50:46 2012 +0100
++++ b/index.mli	Sun Oct 28 21:59:11 2012 +0100
 @@ -1,42 +1,39 @@
 -type siginfo
 -val empty_siginfo : unit -> siginfo
  val is_revoked : Packet.packet list -> bool
  val key_to_lines_normal :
    Request.request -> Packet.packet list -> string -> string list
-diff -r 3c75386bc7ce request.ml
---- a/request.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/request.ml	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a request.ml
+--- a/request.ml	Sun Oct 28 21:50:46 2012 +0100
++++ b/request.ml	Sun Oct 28 21:59:11 2012 +0100
 @@ -45,6 +45,7 @@
                   machine_readable: bool;
                   clean: bool;
                  else request
              | ("op","stats") -> {request with kind = Stats };
              | ("op","x-stats") -> {request with kind = Stats };
-diff -r 3c75386bc7ce request.mli
---- a/request.mli	Sat Oct 27 23:15:53 2012 +0200
-+++ b/request.mli	Sun Oct 28 19:39:53 2012 +0100
+diff -r 5a15aab0027a request.mli
+--- a/request.mli	Sun Oct 28 21:50:46 2012 +0100
++++ b/request.mli	Sun Oct 28 21:59:11 2012 +0100
 @@ -11,6 +11,7 @@
    machine_readable : bool;
    clean : bool;
  }
  val default_request : request
  val comma_rxp : Str.regexp
-diff -r 3c75386bc7ce sigInfo.ml
+diff -r 5a15aab0027a sigInfo.ml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/sigInfo.ml	Sun Oct 28 19:39:53 2012 +0100
++++ b/sigInfo.ml	Sun Oct 28 21:59:11 2012 +0100
 @@ -0,0 +1,132 @@
 +(***********************************************************************)
 +(* sigInfo.ml                                                           *)
 +  end;
 +  siginfo
 +  
-diff -r 3c75386bc7ce sigInfo.mli
+diff -r 5a15aab0027a sigInfo.mli
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/sigInfo.mli	Sun Oct 28 19:39:53 2012 +0100
++++ b/sigInfo.mli	Sun Oct 28 21:59:11 2012 +0100
 @@ -0,0 +1,14 @@
 +type siginfo = {
 +  mutable userid : string option;
+# HG changeset patch
+# Parent 3c75386bc7ce409eca4a4629b4b14b252a8808e8
+MultiSearch
 CleanOption
 #KeyExpirationTime
 Use Long KeyID