# HG changeset patch
# User address@hidden
# Date 1337937271 -7200
# Node ID 0d11db9501d9a004394766984f422d5b8f893663
# Parent  db829ad86f241856d6158717c92fb9123b804e83
Add sksclient

diff -r db829ad86f24 -r 0d11db9501d9 Makefile
--- a/Makefile	Sun May 20 21:42:30 2012 +0100
+++ b/Makefile	Fri May 25 11:14:31 2012 +0200
@@ -159,6 +159,12 @@
 spider.bc: $(LIBS.bc) $(ALLOBJS.bc) spider.cmo
 	$(OCAMLC) -o spider.bc $(OCAMLFLAGS) $(ALLOBJS.bc) spider.cmo
 
+sksclient: $(LIBS) $(ALLOBJS) sksclient.cmx
+	$(OCAMLOPT) -o sksclient $(OCAMLOPTFLAGS) $(ALLOBJS) sksclient.cmx
+
+sksclient.bc: $(LIBS.bc) $(ALLOBJS.bc) sksclient.cmo
+	$(OCAMLC) -o sksclient.bc $(OCAMLFLAGS) $(ALLOBJS.bc) sksclient.cmo
+
 sks: $(LIBS) $(ALLOBJS) sks.cmx
 	$(OCAMLOPT) -o sks $(OCAMLOPTFLAGS) $(ALLOBJS) sks.cmx
 
diff -r db829ad86f24 -r 0d11db9501d9 sksclient.ml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sksclient.ml	Fri May 25 11:14:31 2012 +0200
@@ -0,0 +1,73 @@
+(************************************************************************)
+(* This file is part of SKS.  SKS is free software; you can
+   redistribute it and/or modify it under the terms of the GNU General
+   Public License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+   USA *)
+(***********************************************************************)
+
+open StdLabels
+open MoreLabels
+open Printf
+open Common
+open DbMessages
+  
+exception Misc_error of string
+exception No_results of string
+
+let key_id =
+  if Array.length Sys.argv = 2 then
+    Sys.argv.(1)
+  else
+    ""
+
+let settings = {
+    Keydb.withtxn = !Settings.transactions;
+    Keydb.cache_bytes = !Settings.cache_bytes;
+    Keydb.pagesize = !Settings.pagesize;
+    Keydb.dbdir = Lazy.force Settings.dbdir;
+    Keydb.dumpdir = Lazy.force Settings.dumpdir;
+ } 
+ module Keydb = Keydb.Safe
+	 
+let get_keys_by_keyid keyid =
+    let keyid_length = String.length keyid in
+    let short_keyid = String.sub ~pos:(keyid_length - 4) ~len:4 keyid in
+    let keys = Keydb.get_by_short_subkeyid short_keyid in
+    match keyid_length with
+      | 4 -> (* 32-bit keyid.  No further filtering required. *)
+	  keys
+
+      | 8 -> (* 64-bit keyid *) 
+	   List.filter keys
+	   ~f:(fun key -> keyid = (Fingerprint.from_key key).Fingerprint.keyid ||
+	   (** Return keys i& subkeys with matching long keyID *)
+	     let (mainkeyid,subkeyids) = Fingerprint.keyids_from_key ~short:false key in
+	     List.exists (fun x -> x = keyid) subkeyids)
+
+      | _ -> raise (Misc_error "Unknown keyid type")
+	  
+let () =
+	set_logfile "sksclient";
+	Keydb.open_dbs settings; 	
+	let keys = get_keys_by_keyid (KeyHash.dehexify key_id) in 
+	let count = List.length keys in
+	if count < 1 then
+	 exit 2;	 
+	let aakeys = 
+	    match keys with
+	      | [] -> ""
+	      | _ -> let keystr = Key.to_string_multiple keys in
+		      Armor.encode_pubkey_string keystr
+	  in
+	printf "%s\n" aakeys;	
+	Keydb.close_dbs ();