[Winpt-commits] r146 - trunk/Include

[scm-commit at wald.intevation.org]

Author: twoaday
Date: 2006-01-13 15:20:51 +0100 (Fri, 13 Jan 2006)
New Revision: 146

Modified:
   trunk/Include/ChangeLog
   trunk/Include/wptKeyCache.h
   trunk/Include/wptKeyserver.h
Log:
2006-01-13  Timo Schulz  <ts at g10code.com>
 
        * wptKeyCache.h (gpg_keycache_next_updated_key): New.
         
2006-01-11  Timo Schulz  <ts at g10code.com>
 
        * wptGPG.h (gpg_data_putc): New.
         



Modified: trunk/Include/ChangeLog
===================================================================
--- trunk/Include/ChangeLog	2006-01-12 17:42:05 UTC (rev 145)
+++ trunk/Include/ChangeLog	2006-01-13 14:20:51 UTC (rev 146)
@@ -1,3 +1,7 @@
+2006-01-13  Timo Schulz  <ts at g10code.com>
+
+	* wptKeyCache.h (gpg_keycache_next_updated_key): New.
+	
 2006-01-11  Timo Schulz  <ts at g10code.com>
 
 	* wptGPG.h (gpg_data_putc): New.

Modified: trunk/Include/wptKeyCache.h
===================================================================
--- trunk/Include/wptKeyCache.h	2006-01-12 17:42:05 UTC (rev 145)
+++ trunk/Include/wptKeyCache.h	2006-01-13 14:20:51 UTC (rev 146)
@@ -1,5 +1,5 @@
 /* wptKeyCache.h
- *	Copyright (C) 2005 Timo Schulz
+ *	Copyright (C) 2005, 2006 Timo Schulz
  *
  * This file is part of WinPT.
  *
@@ -79,5 +79,7 @@
 					     const char *pubr, 
 					     const char *secr);
 gpgme_error_t gpg_keycache_sync (gpg_keycache_t pub, gpg_keycache_t sec);
+gpgme_error_t gpg_keycache_next_updated_key (gpg_keycache_t ctx,
+					     struct keycache_s **r_obj);
 
 #endif /*WPT_KEYCACHE_H*/

Modified: trunk/Include/wptKeyserver.h
===================================================================
--- trunk/Include/wptKeyserver.h	2006-01-12 17:42:05 UTC (rev 145)
+++ trunk/Include/wptKeyserver.h	2006-01-13 14:20:51 UTC (rev 146)
@@ -1,5 +1,5 @@
 /* wptKeyserver.h - Keyserver headerfile
- *	Copyright (C) 2000-2005 Timo Schulz
+ *	Copyright (C) 2000-2006 Timo Schulz
  *
  * This file is part of WinPT.
  *
@@ -61,22 +61,10 @@
     char *pass;		/* proxy password. */
 };
 
-struct keyserver_node {
-    keyserver_node *	next;
-    keyserver		host;
-    int			used;
-};
-
-struct keyserver_cfgfile {
-    keyserver_node *	list;
-    keyserver_proxy_ctx proxy;
-    int			nlist;
-};
-
 #define MAX_KEYSERVERS 32
 extern keyserver server[MAX_KEYSERVERS]; /* runtime initialized */
 extern char *default_keyserver;
-extern unsigned short default_keyserver_port;
+extern WORD default_keyserver_port;
 
 struct keyserver_key {
     int	    bits;	    /* length of the key. */
@@ -85,7 +73,6 @@
     char    uid[384];	    /* primary user-id. */
 };
 
-const char* kserver_strerror (void);
 
 /*-- Winsock2 support --*/
 int wsock_init (void);
@@ -98,25 +85,23 @@
 const char* kserver_get_proxy (int *r_port);
 const char* kserver_get_proxy_info (int id);
 
-int kserver_read_config( const char *fname, keyserver_cfgfile **ret_cfg );
-int kserver_write_config( const char *fname, keyserver_cfgfile *cfg );
-void kserver_cfgfile_release( keyserver_cfgfile *cfg );
-void kserver_change_proxy( keyserver_proxy_ctx *ctx );
-void proxy_release( keyserver_proxy_ctx *ctx );
-const char * kserver_get_hostname (int idx, int type, unsigned short *port);
+void kserver_change_proxy (keyserver_proxy_ctx *ctx);
+void proxy_release (keyserver_proxy_ctx *ctx);
+const char* kserver_get_hostname (int idx, int type, unsigned short *port);
 void keyserver_set_default (const char *hostname, unsigned short port);
 void set_default_kserver (void);
 
 /*-- General --*/
 int check_IP_or_hostname (const char *name);
+const char* kserver_strerror (void);
 int kserver_check_inet_connection (void);
-int kserver_connect (const char *hostname, unsigned short port, int *conn_fd);
-int kserver_sendkey (const char *hostname, unsigned short port, 
+int kserver_connect (const char *hostname, WORD port, int *conn_fd);
+int kserver_sendkey (const char *hostname, WORD port, 
 		     const char *pubkey, int len);
-int kserver_recvkey (const char *hostname, unsigned short port, 
+int kserver_recvkey (const char *hostname, WORD port, 
 		     const char *keyid, char *key, int maxkeylen);
 
-int kserver_search_init(const char *hostname, unsigned short port, 
+int kserver_search_init(const char *hostname, WORD port, 
 			const char *keyid, int *conn_fd);
 int kserver_search_chkresp (int conn_fd);
 int kserver_search (int conn_fd, keyserver_key *key);