/[winpt]/trunk/Src/wptKeyserver.cpp

Diff of /trunk/Src/wptKeyserver.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 73 by twoaday,
Tue Nov  8 07:15:13 2005 UTC
+revision 290 by twoaday,
Sat Mar 10 11:18:34 2007 UTC
 Line 1
  /* wptKeyserver.cpp - W32 Keyserver Access
-  *      Copyright (C) 2000-2005 Timo Schulz
+  *      Copyright (C) 2000-2007 Timo Schulz
   *      Copyright (C) 2001 Marco Cunha
   *
   * This file is part of WinPT.
 Line 13
   * 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 WinPT; if not, write to the Free Software Foundation,
-  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #endif
  #include <windows.h>
+ #include <shlobj.h>
  #include <stdio.h>
  #include <sys/stat.h>
  #include <ctype.h>
+ #include "wptGPG.h"
  #include "wptKeyserver.h"
  #include "wptErrors.h"
  #include "wptTypes.h"
  #include "wptNLS.h"
  #include "wptW32API.h"
- #include "wptVersion.h"
- #include "wptGPG.h"
  #include "wptRegistry.h"
+ #include "wptUTF8.h"
+ #include "wptVersion.h"
+ #include "StringBuffer.h"
+ /* Map net_errno to a winsock error. */
+ #define net_errno ((int)WSAGetLastError ())
- static char base64code[] =
-   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
  keyserver server[MAX_KEYSERVERS] = {0};
- static keyserver_proxy_ctx proxy = {0};
+ keyserver_proxy_s proxy = {0};
- static const char * server_list[] = {
+ static const char *server_list[] = {
-     "hkp://wwwkeys.nl.pgp.net",
+     "hkp://sks.keyserver.penguin.de",
-     "hkp://wwwkeys.pl.pgp.net",
-     "hkp://wwwkeys.at.pgp.net",
-     "hkp://wwwkeys.ch.pgp.net",
-     "hkp://wwwkeys.de.pgp.net",
-     "hkp://wwwkeys.dk.pgp.net",
-     "hkp://wwwkeys.cz.pgp.net",
-     "hkp://wwwkeys.es.pgp.net",
-     "hkp://wwwkeys.eu.pgp.net",
-     "hkp://wwwkeys.uk.pgp.net",
-     "hkp://wwwkeys.us.pgp.net",
-     "hkp://gnv.us.ks.cryptnet.net",
      "hkp://subkeys.pgp.net",
      "ldap://keyserver.pgp.com",
      NULL
  };
- static char hkp_errmsg[1024];
- static int hkp_err = 0;
- static u32 conf_timestamp = 0;
- char * default_keyserver = NULL;
- unsigned short default_keyserver_port = 0;
+ static char  hkp_errmsg[1024];  /* Holds the error message from the server */
+ static int   hkp_err = 0;       /* != 0 indicates an error occurred. */
+ /* Default keyserver and port. */
+ char *default_keyserver = NULL;
+ WORD default_keyserver_port = 0;
+ /* Default socket timeout (secs). */
+ static size_t default_socket_timeout = 6;
+ /* Wrapper for safe memory allocation. */
+ static char*
+ safe_alloc (DWORD n)
+ {
+     char *p;
+     p = new char[n+1];
+     if (!p)
+         BUG (0);
+     memset (p, 0, n);
+     return p;
+ }
+ /* Basic64 encode the input @inbuf to @outbuf. */
  static void
- base64_encode( const char *inputstr, char *outputstr, int maxlen )
+ base64_encode (const char *inbuf, char *outbuf)
  {
-     int index = 0, temp = 0, res = 0, i = 0, inputlen = 0, len = 0;
+     char base64code[] =
+         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+     int index = 0, temp = 0, res = 0;
+     int i, inputlen, len = 0;
-     inputlen = strlen (inputstr); /* fixme: check if len > maxlen */
+     inputlen = strlen (inbuf);
-     for (i = 0; i <inputlen; i++) {
+     for (i = 0; i < inputlen; i++) {
          res = temp;
-         res = (res << 8) | (inputstr[i] & 0xFF);
+         res = (res << 8) | (inbuf[i] & 0xFF);
          switch (index++) {
-         case 0: outputstr[len++] = base64code[res >> 2 & 0x3F]; res &= 0x3; break;
+         case 0:
-         case 1: outputstr[len++] = base64code[res >> 4 & 0x3F]; res &= 0xF; break;
+             outbuf[len++] = base64code[res >> 2 & 0x3F];
-         case 2: outputstr[len++] = base64code[res >> 6 & 0x3F];
+             res &= 0x3;
-                 outputstr[len++] = base64code[res & 0x3F]; res = index = 0; break;
+             break;
+         case 1:
+             outbuf[len++] = base64code[res >> 4 & 0x3F];
+             res &= 0xF;
+             break;
+         case 2:
+             outbuf[len++] = base64code[res >> 6 & 0x3F];
+             outbuf[len++] = base64code[res & 0x3F];
+             res = index = 0;
+             break;
          }
          temp = res;
      }
-     switch( index ) {
+     if (index == 2) {
-     case 0: break;
+         outbuf[len++] = base64code[temp << 2 & 0x3F];
-     case 2: outputstr[len++] = base64code[temp << 2 & 0x3F];
+         outbuf[len++] = '=';
-             outputstr[len++] = '='; break;
-     case 1: outputstr[len++] = base64code[temp << 4 & 0x3F];
-             outputstr[len++] = '=';
-             outputstr[len++] = '=';
      }
+     else if (index == 1) {
-     outputstr[len] = '\0';
+         outbuf[len++] = base64code[temp << 4 & 0x3F];
- } /* base64_encode */
+         outbuf[len++] = '=';
+         outbuf[len++] = '=';
+     }
+     outbuf[len] = '\0';
+ }
+ /* Check that the given buffer contains a valid keyserver URL
+    and return the prefix length, 0 in case of an error. */
+ static int
+ check_URL (const char *buf)
+ {
+     const char *proto[] = {
+         "ldap://",
+         "http://",
+         "finger://",
+         "hkp://",
+         NULL};
+     int i;
+     if (strlen (buf) < 7)
+         return 0;
+     for (i=0; proto[i] != NULL; i++) {
+         if (strstr (buf, proto[i]))
+             return strlen (proto[i]);
+     }
+     return 0;
+ }
  /* Skip the URL schema and return only the host part of it. */
- static const char *
+ static const char*
- skip_type_prefix (const char * hostname)
+ skip_type_prefix (const char *hostname)
  {
-     if (hostname && !strncmp (hostname, "http://", 7))
+     int pos;
-         hostname += 7;
-     else if (hostname && !strncmp (hostname, "hkp://", 6))
+     if (!hostname)
-         hostname += 6;
+         return hostname;
-     else if (hostname && !strncmp (hostname, "finger://", 9))
-         hostname += 9;
+     pos = check_URL (hostname);
-     else if (hostname && !strncmp (hostname, "ldap://", 7))
+     if (pos > 0)
-         hostname += 7;
+         hostname += pos;
      return hostname;
  }
+ /* Parse the keyserver response and extract the human
+    readable text passages. */
+ static int
+ parse_keyserver_error (const char *resp, char *txt, size_t txtlen)
+ {
+     char *p, *p2;
+     /* If we find no 'Error' substring, we assume a success. */
+     if (!stristr (resp, "Error"))
+         return -1;
+     memset (txt, 0, txtlen);
+     p = strstr (resp, "\r\n\r\n");
+     if (!p)
+         return -1;
+     resp += (p-resp);
+     p = strstr (resp, "<h1>");
+     if (!p)
+         return -1;
+     resp += (p-resp)+strlen ("<h1>");
+     p = strstr (resp, "</h1>");
+     if (!p)
+         return -1;
+     resp += (p-resp)+strlen ("</h1>");
+     p2 = strstr (resp, "</body>");
+     if (p2 != NULL)
+         memcpy (txt, resp, (p2-resp));
+     else {
+         if (!strnicmp (resp, "<p>", 3))
+             resp += 3;
+         while (resp && *resp == '\r' || *resp == '\n')
+             resp++;
+         memcpy (txt, resp, strlen (resp));
+     }
+     return 0;
+ }
  /* Check that the keyserver response indicates an OK.
     Return 0 on success. */
  static int
  check_hkp_response (const char *resp, int recv)
  {
-     int ec, len;
+     int ec;
-     char *p, * end;
+     log_debug ("check_hkp_response: '%s'\r\n", resp);
      ec = recv ? WPTERR_WINSOCK_RECVKEY : WPTERR_WINSOCK_SENDKEY;
      if (!strstr (resp, "HTTP/1.0 200 OK") &&
-         !strstr (resp, "HTTP/1.1 200 OK")) /* http error */
+         !strstr (resp, "HTTP/1.1 200 OK") &&
-         return ec;
+         !strstr (resp, "HTTP/1.0 500 OK") &&
-     if (strstr (resp, "Public Key Server -- Error")
+         !strstr (resp, "HTTP/1.1 500 OK"))
-         || strstr (resp, "Public Key Server -- Error")
+         return ec; /* http error */
-         || strstr (resp, "No matching keys in database")) {
-         p = strstr (resp, "<p>");
+     if (!parse_keyserver_error (resp, hkp_errmsg, DIM (hkp_errmsg)-2)) {
-         if (p && strlen (p) < sizeof (hkp_errmsg)) {
+         if (!strlen (hkp_errmsg))
-             end = strstr (p, "</p>");
+             _snprintf (hkp_errmsg, DIM (hkp_errmsg)-1,
-             len = end? (end - p + 1) : strlen (p);
+                         "Unknown keyserver error");
-             strncpy (hkp_errmsg, p, len);
+         hkp_err = 1;
-             hkp_err = 1;
-         }
          return ec;
      }
      return 0;
-Line 147 
 static int
+Line 228 
 static int
  sock_getline (int fd, char *buf, int buflen, int *nbytes)
  {
      char ch;
-     int count = 0;
+     int nread = 0;
      if (nbytes)
          *nbytes = 0;
      *buf = 0;
      while (recv (fd, &ch, 1, 0) > 0) {
          *buf++ = ch;
-         count++;
+         nread++;
-         if (ch == '\n' || count == (buflen - 1)) {
+         if (ch == '\r')
+             continue; /* remove this char. */
+         if (ch == '\n' || nread == (buflen - 1)) {
              *buf = 0;
              if (nbytes)
-                 *nbytes = count;
+                 *nbytes = nread;
              return 0;
          }
      }
-Line 177 
 sock_select (int fd, int nsecs)
+Line 260 
 sock_select (int fd, int nsecs)
      FD_ZERO (&rfd);
      FD_SET (fd, &rfd);
-     if (select (fd + 1, &rfd, NULL, NULL, &tv) == SOCKET_ERROR)
+     if (select (fd + 1, &rfd, NULL, NULL, &tv) == SOCKET_ERROR) {
+         log_debug ("sock_select: select() failed ec=%d.\r\n", net_errno);
          return SOCKET_ERROR;
+     }
      if (FD_ISSET (fd, &rfd))
          return 1;
      return 0;
  }
- /* Read from a socket with a fixed timeout of 10 seconds.
+ /* Read from a socket @fd to buffer @buf with a fixed timeout
+    of 10 seconds. The amount of bytes which were read are
+    returned in @nbytes.
     Return value: 0 on success. */
  static int
- sock_read (int fd, char *buf, int buflen, int *nbytes)
+ sock_read (int fd, char *buf, size_t buflen, int *nbytes)
  {
-     DWORD nread;
+     int nread;
-     int nleft = buflen;
+     size_t nleft = buflen;
-     int rc, n = 0;
+     size_t n = 0;
+     int rc;
+     if (nbytes)
+         *nbytes = 0;
      while (nleft > 0) {
-         if (n >= 10)
+         if (n >= default_socket_timeout)
              return WPTERR_WINSOCK_TIMEOUT;
          rc = sock_select (fd, 1);
          if (rc == SOCKET_ERROR)
-             return SOCKET_ERROR;
+             return rc;
-         else if( !rc )
+         else if (!rc)
              n++;
          else {
              nread = recv (fd, buf, nleft, 0);
-             if (nread == SOCKET_ERROR)
+             if (nread == SOCKET_ERROR) {
+                 log_debug ("sock_read: recv() failed ec=%d.\r\n", net_errno);
                  return SOCKET_ERROR;
+             }
              else if (!nread)
                  break;
              nleft -= nread;
-Line 219 
 sock_read (int fd, char *buf, int buflen
+Line 311 
 sock_read (int fd, char *buf, int buflen
  }
- /* Write @buf to a socket @fd. */
+ /* Helper to create a string from the gpgme data and
+    then release the gpgme data object. */
+ char*
+ data_release_and_get_mem (gpgme_data_t in, size_t *r_bufferlen)
+ {
+     size_t n;
+     char *buffer, *p;
+     gpg_data_putc (in, '\0');
+     p = gpgme_data_release_and_get_mem (in, &n);
+     buffer = m_strdup (p);
+     if (r_bufferlen)
+         *r_bufferlen = n;
+     gpgme_free (p);
+     return buffer;
+ }
+ /* Read much data as possible from the socket @fd and
+    return the data in @buffer. Caller must free data.
+    Return value: 0 on success. */
+ int
+ sock_read_ext (int fd, char **buffer, size_t *r_bufferlen)
+ {
+     gpgme_data_t dh;
+     char buf[1024];
+     size_t timeout=0;
+     int nread, rc;
+     if (gpgme_data_new (&dh))
+         return SOCKET_ERROR;
+     while (timeout < default_socket_timeout) {
+         rc = sock_select (fd, 1);
+         if (rc == SOCKET_ERROR) {
+             gpgme_data_release (dh);
+             return rc;
+         }
+         else if (!rc)
+             timeout++; /* socket not ready yet. */
+         else {
+             nread = recv (fd, buf, DIM (buf), 0);
+             if (nread == SOCKET_ERROR)
+                 return SOCKET_ERROR;
+             else if (!nread)
+                 break;
+             gpgme_data_write (dh, buf, nread);
+         }
+     }
+     if (timeout >= default_socket_timeout)
+         return WPTERR_WINSOCK_TIMEOUT;
+     *buffer = data_release_and_get_mem (dh, r_bufferlen);
+     return 0;
+ }
+ /* Write the buffer @buf with the length @buflen to a socket @fd. */
  static int
- sock_write (int fd, const char *buf, int buflen)
+ sock_write (int fd, const char *buf, size_t buflen)
  {
-     DWORD nwritten;
+     int nwritten;
      int nleft = buflen;
      while (nleft > 0) {
          nwritten = send (fd, buf, nleft, 0);
-         if (nwritten == SOCKET_ERROR)
+         if (nwritten == SOCKET_ERROR) {
+             log_debug ("sock_write: send() failed ec=%d\r\n", net_errno);
              return SOCKET_ERROR;
+         }
          nleft -= nwritten;
          buf += nwritten;
      }
      return 0;
  }
- void
- set_default_kserver (void)
- {
-     char * p = get_reg_entry_keyserver ("Default");
-     free_if_alloc (default_keyserver);
-     default_keyserver = p && *p != ' ' ? p : m_strdup (DEF_HKP_KEYSERVER);
-     p = get_reg_entry_keyserver ("Default_Port");
-     if (p && *p) {
-         default_keyserver_port = (u16)strtoul (p, NULL, 10);
-         free_if_alloc (p);
-     }
-     else
-         default_keyserver_port = HKP_PORT;
- }
  /* Initialize the Winsock2 interface.*/
  int
  wsock_init (void)
  {
      WSADATA wsa;
-     if (WSAStartup (0x202, &wsa))
+     if (WSAStartup (0x202, &wsa)) {
+         log_debug ("wsock_init: WSAStartup failed ec=%d\r\n", net_errno);
          return WPTERR_WINSOCK_INIT;
-     set_default_kserver ();
+     }
      return 0;
  }
-Line 271 
 wsock_init (void)
+Line 405 
 wsock_init (void)
  void
  wsock_end (void)
  {
+     char *p;
      int i;
+ #ifdef WINPT_MOBILE
+     p = m_strdup ("keyserver.conf");
+ #else
+     p = make_special_filename (CSIDL_APPDATA, "winpt\\keyserver.conf", NULL);
+ #endif
+     kserver_save_conf (p);
+     free_if_alloc (p);
      free_if_alloc (default_keyserver);
-     default_keyserver = NULL;
      for (i=0; i < MAX_KEYSERVERS; i++) {
-         if (server[i].used)
+         if (server[i].name != NULL)
              free_if_alloc (server[i].name);
      }
+     kserver_proxy_release (&proxy);
      WSACleanup ();
+     log_debug ("wsock_end: cleanup finished.\r\n");
  }
  /* Return a string representation of a winsock error. */
  const char*
  wsock_strerror (void)
  {
-     static char buf[384];
      int ec = WSAGetLastError ();
+     if (!ec)
+         return "";
      switch (ec) {
      case WSAENETDOWN:
-         return _("The network subsystem has failed");
+         return _("Network unreachable");
-     case WSAHOST_NOT_FOUND:
-         return _("Authoritative Answer Host not found");
+     case WSAEHOSTUNREACH:
-     case WSAETIMEDOUT:
+         return _("Host unreachable");
-         return _("The connection has been dropped because of a network failure");
-     default:
+     case WSAHOST_NOT_FOUND:
-         _snprintf (buf, sizeof (buf) -1, _("Unknown Winsock error ec=%d"),ec);
+         return _("Could not resolve host name");
-         return buf;
+     case WSAECONNREFUSED:
+         return _("Connection refused");
+     case WSAETIMEDOUT:
+     case WSAECONNABORTED:
+         return _("Connection timeout");
+     case WSAENETRESET:
+     case WSAECONNRESET:
+         return _("Connection resetted by peer");
+     case WSAESHUTDOWN:
+         return _("Socket has been shutdown");
+     default:
+         break;
      }
-     return NULL;
+     return "";
+ }
+ /* Set default socket timeout for all reading operations. */
+ void
+ kserver_set_socket_timeout (size_t nsec)
+ {
+     if (nsec < 0 || nsec > 3600)
+         nsec = 0;
+     default_socket_timeout = nsec;
  }
-Line 318 
 kserver_strerror (void)
+Line 489 
 kserver_strerror (void)
  /* Read a keyserver from the list at index @idx.
     Return value: keyserver name at the given position. */
  const char*
- kserver_get_hostname (int idx, int type, u16 *port)
+ kserver_get_hostname (int idx, int type, WORD *port)
  {
      if (type == -1) {
          *port = default_keyserver_port;
          return default_keyserver;
      }
-     else if (!type && idx < DIM (server_list)) {
+     else if (!type && (size_t)idx < DIM (server_list)) {
+         /* XXX: handle non HKP servers. */
          *port = HKP_PORT;
          return server_list[idx];
      }
-Line 343 
 kserver_check_inet_connection (void)
+Line 515 
 kserver_check_inet_connection (void)
          closesocket (fd);
          return 0;
      }
+     log_debug ("kserver_check_inet_connection: no inet connection.\r\n");
      return -1;
  }
- /*
+ /* If the request contains the keyid, it have to be
-  * If the request contains the keyid, it have to be
+    always postfix with '0x'+keyid. This code checks
-  * always postfix with '0x'+keyid. This code checks
+    if the keyid is a decimal value and if so if it contains
-  * if the keyid is a decimal value and if so if it contains
+    the '0x'. If not it is inserted. */
-  * the '0x'. If not it is inserted.
-  */
  const char*
  kserver_check_keyid (const char *keyid)
  {
-     static char id[20];
+     static char id[22];
      if (strstr (keyid, "@"))
          return keyid; /* email address */
      if (strncmp (keyid, "0x", 2)) {
          memset (&id, 0, sizeof (id));
-         _snprintf (id, sizeof (id)-1, "0x%s", keyid);
+         _snprintf (id, DIM (id)-1, "0x%s", keyid);
          return id;
      }
      return keyid;
- } /* kserver_check_keyid */
+ }
+ /* Update the keyserver proxy user. */
  static void
- kserver_update_proxyuser (const char *proxy_user, const char *proxy_pass)
+ update_proxy_user (const char *proxy_user, const char *proxy_pass)
  {
      char t[257]; /* user:pass = 127+1+127+1 = 257 */
      int n = 0;
      n = 4*strlen (proxy_user) / 3 + 32 + strlen (proxy_pass) + 2;
      free_if_alloc (proxy.base64_user);
-     proxy.base64_user = new char[n];
+     proxy.base64_user = safe_alloc (n+1);
-     if (!proxy.base64_user)
+     _snprintf (t, DIM (t)-1, "%s:%s", proxy_user, proxy_pass);
-         BUG (0);
+     base64_encode (t, proxy.base64_user);
-     _snprintf (t, sizeof (t)-1, "%s:%s", proxy_user, proxy_pass);
-     base64_encode (t, proxy.base64_user, 257);
      free_if_alloc (proxy.user);
      free_if_alloc (proxy.pass);
      proxy.user = m_strdup (proxy_user);
      proxy.pass = m_strdup (proxy_pass);
- } /* kserver_update_proxyuser */
- /* Check that the given buffer contains a valid keyserver URL. */
- static int
- check_URL (const char * buf)
- {
-     if (strlen (buf) < 7)
-         return -1;
-     if (!strstr (buf, "ldap://")
-         && !strstr (buf, "http://")
-         && !strstr (buf, "finger://")
-         && !strstr (buf, "hkp://"))
-         return -1;
-     return 0;
  }
-Line 409 
 static int
+Line 564 
 static int
  port_from_proto (int proto)
  {
      switch (proto) {
-     case KSPROTO_LDAP: return 0;
+     case KSPROTO_LDAP:   return LDAP_PORT;
      case KSPROTO_FINGER: return FINGER_PORT;
-     case KSPROTO_HTTP: return HKP_PORT;
+     case KSPROTO_HTTP:   return HKP_PORT;
      }
      return 0;
  }
-Line 419 
 port_from_proto (int proto)
+Line 574 
 port_from_proto (int proto)
  /* Get the port number from the given URL. */
  static int
- proto_from_URL (const char * buf)
+ proto_from_URL (const char *buf)
  {
-     if (strstr( buf, "ldap"))
+     if (strstr (buf, "ldap"))
          return KSPROTO_LDAP;
-     else if (strstr( buf, "finger"))
+     else if (strstr (buf, "finger"))
          return KSPROTO_FINGER;
      return KSPROTO_HKP;
  }
+ /* Set the default keyserver.
+    If @hostname is NULL, use the predefined keyserver. */
  void
- keyserver_set_default (const char * hostname, u16 port)
+ keyserver_set_default (const char *hostname, WORD port)
  {
-     if (hostname) {
+     if (!port)
+         port = HKP_PORT;
+     if (hostname != NULL) {
          free_if_alloc (default_keyserver);
          default_keyserver = m_strdup (hostname);
-         if (!default_keyserver)
-             BUG (0);
          default_keyserver_port = port;
      }
+     if (!default_keyserver) {
+         default_keyserver = m_strdup (DEF_HKP_KEYSERVER);
+         default_keyserver_port = HKP_PORT;
+     }
      server[0].name =  m_strdup (default_keyserver);
      server[0].used = 1;
      server[0].port = port;
      server[0].proto = proto_from_URL (default_keyserver);
- } /* keyserver_set_default */
+ }
- static const char *
+ /* Skip all kind of whitespace chars in @str. */
- skip_whitespace (const char * str)
+ static const char*
+ skip_whitespace (const char *str)
  {
-     while (str && *str)
+     while (str && *str) {
-     {
          if (*str == ' ' ||
              *str == '\t' ||
              *str == '\n' ||
-             *str == '\r')
+             *str == '\r') {
-         {
              str++;
              continue;
          }
-Line 465 
 skip_whitespace (const char * str)
+Line 625 
 skip_whitespace (const char * str)
  }
+ /* Save the keyserver config file in @conf. */
  int
- kserver_load_conf (const char * conf)
+ kserver_save_conf (const char *conf)
+ {
+     FILE *fp;
+     int pos;
+     fp = fopen (conf, "wb");
+     if (!fp) {
+         msg_box (NULL, _("Could not save keyserver.conf file"),
+                  _("Keyserver"), MB_ERR);
+         return -1;
+     }
+     fprintf (fp, "# do NOT manually modify this file, it will be "
+                  "generated automatically!!\r\n");
+     for (pos = 0; pos < MAX_KEYSERVERS; pos++) {
+         if (!server[pos].used)
+             continue;
+         fprintf (fp, "%s:%d\r\n", server[pos].name, server[pos].port);
+     }
+     fclose (fp);
+     return 0;
+ }
+ /* Return the specified keyserver config setting @key as an integer. */
+ static int
+ get_conf_kserver_int (const char *key)
  {
-     struct stat statbuf;
+     char *p;
+     int val = 0;
+     p = get_reg_entry_keyserver (key);
+     if (p && *p)
+         val = atoi (p);
+     free_if_alloc (p);
+     return val;
+ }
+ /* Read the proxy configuration and store it into @prox. */
+ static void
+ read_proxy_config (keyserver_proxy_t prox)
+ {
+     char *proto;
+     if (!prox)
+         return;
+     proto = get_reg_entry_keyserver("Proto");
+     if (proto != NULL && strlen (proto) > 0)
+         prox->proto = atoi (proto);
+     else
+         prox->proto = PROXY_PROTO_NONE;
+     free_if_alloc (proto);
+     free_if_alloc (prox->host);
+     prox->host = get_reg_entry_keyserver ("Host");
+     free_if_alloc (prox->user);
+     prox->user = get_reg_entry_keyserver ("User");
+     free_if_alloc (prox->pass);
+     prox->pass = get_reg_entry_keyserver ("Pass");
+     prox->port = get_conf_kserver_int ("Port");
+ }
+ /* Load the keyserver config file @conf. */
+ int
+ kserver_load_conf (const char *conf)
+ {
      FILE *fp;
-     char buf[1024], * s, *p;
+     char buf[1024], *s, *p;
      char *user = NULL, *pass = NULL;
+     int no_config=0, chk_pos;
      int pos;
-     int no_config=0, chk_pos=0;
      for (pos = 0; pos < MAX_KEYSERVERS; pos++) {
          server[pos].used = 0;
          server[pos].port = HKP_PORT;
+         server[pos].name = NULL;
      }
      fp = fopen (conf, "rb");
-Line 487 
 kserver_load_conf (const char * conf)
+Line 714 
 kserver_load_conf (const char * conf)
              server[pos].name = m_strdup (server_list[pos]);
              server[pos].proto = proto_from_URL (server_list[pos]);
          }
-         no_config=1;
+         no_config = 1;
      }
-     get_reg_proxy_prefs (&proxy.host, &proxy.port, &user, &pass);
+     read_proxy_config (&proxy);
      if (user && pass)
-         kserver_update_proxyuser (user, pass);
+         update_proxy_user (user, pass);
      else if (user && !pass || !user && pass) {
-         msg_box( NULL, _("Invalid proxy configuration."
+         msg_box (NULL, _("Invalid proxy configuration. "
-                          "You need to set a user and a password"
+                          "You need to set a user and a password "
-                          "to use proxy authentication!"), _("Proxy Error"), MB_ERR );
+                          "to use proxy authentication!"),
+                          _("Proxy Error"), MB_ERR);
      }
      /* check if the host has a http:// prefix and skip it */
-     if( proxy.host && !strncmp( proxy.host, "http://", 7 ) ) {
+     if (proxy.host && !strncmp (proxy.host, "http://", 7)) {
-         char *pr = m_strdup (proxy.host+7);
+         char *host = m_strdup (proxy.host+7);
-         if (!pr)
-             BUG (NULL);
          free_if_alloc (proxy.host);
-         proxy.host = pr;
+         proxy.host = host;
      }
      free_if_alloc (user);
      free_if_alloc (pass);
      pos = 0;
-     while( fp && !feof( fp ) ) {
+     while (fp && !feof (fp)) {
-         s = fgets (buf, sizeof (buf)-1, fp);
+         s = fgets (buf, DIM (buf)-1, fp);
          if (!s)
              break;
          if (strstr (buf, "\r\n"))
-Line 520 
 kserver_load_conf (const char * conf)
+Line 746 
 kserver_load_conf (const char * conf)
          s = (char *)skip_whitespace (buf);
          if (*s == '#' || strlen (s) < 7)
              continue;
-         if (check_URL (s)) {
+         chk_pos = check_URL (s);
+         if (!chk_pos) {
              msg_box (NULL, _("All entries of this file must have a valid prefix.\n"
                               "Currently HKP/HTTP, LDAP and FINGER are supported.\n"),
                               _("Keyserver Error"), MB_ERR);
              continue;
          }
-         chk_pos=6;
-         if (strstr (s, "finger"))
-             chk_pos = 10;
          p = strchr (s+chk_pos, ':');
          server[pos].used = 1;
          server[pos].proto = proto_from_URL (s);
-Line 539 
 kserver_load_conf (const char * conf)
+Line 763 
 kserver_load_conf (const char * conf)
              server[pos].port = atol (p+1);
              if (server[pos].port < 0 || server[pos].port > 65536)
                  server[pos].port = HKP_PORT;
-             server[pos].name = new char [(p-s)+2];
+             server[pos].name = safe_alloc ((p-s)+2);
-             if (!server[pos].name)
-                 BUG (0);
              memset (server[pos].name, 0, (p-s)+2);
              memcpy (server[pos].name, s, (p-s));
          }
          pos++;
          if (pos > MAX_KEYSERVERS) {
-             msg_box (NULL, _("The keyserver limit is exceeded"), _("Keyserver Warning"), MB_INFO);
+             msg_box (NULL, _("The keyserver limit is exceeded"),
+                      _("Keyserver Warning"), MB_INFO);
              break;
          }
      }
      if (fp)
          fclose (fp);
      if (!pos) {
-         /* only issue an error if the config file exist but it has no valid entries. */
+         /* Only issue an error if the config file exist but
+            it has no valid entries. */
          keyserver_set_default (NULL, HKP_PORT);
          if (!no_config)
              return WPTERR_CONFIG_FILE;
      }
-     if (!stat (conf, &statbuf))
-         conf_timestamp = statbuf.st_mtime;
      return 0;
- } /* kserver_load_conf */
+ }
- const char *
- kserver_get_proxy (int * r_port)
- {
-     if (proxy.host) {
-         if (r_port)
-             *r_port = proxy.port;
-         return proxy.host;
-     }
-     return NULL;
- } /* kserver_get_proxy */
- const char *
- kserver_get_proxy_info (int id)
- {
-     switch (id) {
-     case PROXY_USER: return proxy.user;
-     case PROXY_PASS: return proxy.pass;
-     }
-     return NULL;
- } /* kserver_get_proxy_info */
- /* Connect to the keyserver @hostname. */
+ /* Connect to the keyserver @hostname (port @port).
+    Return value: 0 on success */
  int
- kserver_connect (const char *hostname, u16 port, int *conn_fd)
+ kserver_connect (const char *hostname, WORD port, int *conn_fd)
  {
-     int rc, fd;
-     u32 iaddr;
-     char host[128] = {0};
      struct hostent *hp;
      struct sockaddr_in sock;
+     char host[128] = {0};
-     log_debug ("kserver_connect: %s:%d\r\n", hostname, port);
+     DWORD iaddr;
+     bool use_proxy = proxy.host != NULL;
+     int rc, fd;
      if (!port)
          port = HKP_PORT;
      if (conn_fd)
          *conn_fd = 0;
      hostname = skip_type_prefix (hostname);
+     log_debug ("kserver_connect: %s:%d\r\n", hostname, port);
+     if (use_proxy && proxy.proto == PROXY_PROTO_HTTP)
+         port = proxy.port;
      memset (&sock, 0, sizeof (sock));
      sock.sin_family = AF_INET;
-     sock.sin_port = proxy.host? htons (proxy.port) : htons (port);
+     sock.sin_port = htons (port);
-     if (proxy.host)
+     strncpy (host, use_proxy? proxy.host : hostname, DIM (host)-1);
-         strncpy (host, proxy.host, 127);
-     else
-         strncpy (host, hostname, 127);
      if ((iaddr = inet_addr (host)) != INADDR_NONE)
          memcpy (&sock.sin_addr, &iaddr, sizeof (iaddr));
      else if ((hp = gethostbyname (host))) {
-Line 625 
 kserver_connect (const char *hostname, u
+Line 824 
 kserver_connect (const char *hostname, u
          memcpy (&sock.sin_addr, hp->h_addr, hp->h_length);
      }
      else {
-         log_debug ("gethostbyname: failed.\r\n");
+         log_debug ("gethostbyname: failed ec=%d.\r\n", net_errno);
-         return WPTERR_WINSOCK_RESOLVE;
+         return use_proxy? WPTERR_WINSOCK_PROXY : WPTERR_WINSOCK_RESOLVE;
      }
      fd = socket (AF_INET, SOCK_STREAM, 0);
      if (fd == INVALID_SOCKET)
          return WPTERR_WINSOCK_SOCKET;
      rc = connect (fd, (struct sockaddr *) &sock, sizeof (sock));
      if (rc == SOCKET_ERROR) {
-         log_debug ("connect: failed.\r\n");
+         log_debug ("connect: failed ec=%d.\r\n", net_errno);
          closesocket (fd);
-         return WPTERR_WINSOCK_CONNECT;
+         return use_proxy? WPTERR_WINSOCK_PROXY : WPTERR_WINSOCK_CONNECT;
+     }
+     if (proxy.proto == PROXY_PROTO_SOCKS5) {
+         /* XXX: finish code and provide errors constants. */
+         rc = socks_handshake (&proxy, fd, hostname, port);
+         if (rc) {
+             closesocket (fd);
+             return WPTERR_GENERAL;
+         }
      }
      if (conn_fd)
          *conn_fd = fd;
      WSASetLastError (0);
      return 0;
- } /* kserver_connect */
+ }
+ /* Check if the URL needs to be encoded or not. */
+ static bool
+ URL_must_encoded (const char *url)
+ {
+     if (strchr (url, '.') || strchr (url, '@') || strchr (url, ' '))
+         return true;
+     return false;
+ }
- /* Perform URL-encoding on the given pubkey blob. */
+ /* Perform URL encoding of the given data. */
  static char*
- kserver_urlencode (const char *pubkey, size_t octets, size_t *newlen)
+ URL_encode (const char *url, DWORD ulen, DWORD *ret_nlen)
  {
-     char *p, numbuf[5];
+     gpgme_data_t hd;
-     size_t j = 0;
+     char numbuf[5], *p;
-     size_t i, size;
+     size_t i, nlen;
-     p = new char [2*octets];
-     if (!p)
-         BUG (0);
-     for (size=0, i=0; i < octets; i++) {
+     if (gpgme_data_new (&hd))
-         if (isalnum (pubkey[i]) || pubkey[i] == '-') {
+         BUG (0);
-             p[size] = pubkey[i];
+     for (i=0; i < ulen; i++) {
-             size++;
+         if (isalnum (url[i]) || url[i] == '-')
-         }
+             gpg_data_putc (hd, url[i]);
-         else if (pubkey[i] == ' ') {
+         else if (url[i] == ' ')
-             p[size] = '+';
+             gpg_data_putc (hd, '+');
-             size++;
-         }
          else {
-             sprintf(numbuf, "%%%02X", pubkey[i]);
+             sprintf (numbuf, "%%%02X", url[i]);
-             for (j = 0; j<strlen(numbuf); j++) {
+             gpgme_data_write (hd, numbuf, strlen (numbuf));
-                 p[size] = numbuf[j];
-                 size++;
-             }
          }
      }
-     p[size] = '\0';
-     *newlen = size;
+     p = data_release_and_get_mem (hd, &nlen);
+     if (ret_nlen)
+         *ret_nlen = nlen;
      return p;
  }
  /* Format a request for the given keyid (send). */
  static char*
- kserver_send_request (const char *hostname, u16 port, const char *pubkey, int octets)
+ kserver_send_request (const char *hostname, WORD port,
+                       const char *pubkey, DWORD octets)
  {
-     char *request = NULL, *enc_pubkey = NULL;
+     const char *fmt;
+     char *request;
+     char *enc_pubkey;
+     DWORD enc_octets;
      int reqlen;
-     size_t enc_octets;
-     log_debug ("kserver_send_request: %s:%d\n", hostname, port);
+     log_debug ("kserver_send_request: %s:%d\r\n", hostname, port);
      if (!port)
          port = HKP_PORT;
-     reqlen = 512 + strlen (hostname) + 2*strlen (pubkey);
+     enc_pubkey = URL_encode (pubkey, octets, &enc_octets);
-     request = new char[reqlen];
+     reqlen = 2*strlen (hostname) + 2*32/*port*/ + enc_octets + 32 /*len*/ + 1;
-     if (!request)
-         BUG (0);
+     if (proxy.user && proxy.proto == PROXY_PROTO_HTTP) {
-     enc_pubkey = kserver_urlencode (pubkey, octets, &enc_octets);
+         fmt = "POST http://%s:%d/pks/add HTTP/1.0\r\n"
-     if (!enc_pubkey || !enc_octets) {
+               "Referer: \r\n"
-         free_if_alloc (request);
+               "User-Agent: WinPT/W32\r\n"
-         return NULL;
+               "Host: %s:%d\r\n"
-     }
+               "Proxy-Authorization: Basic %s\r\n"
+               "Content-type: application/x-www-form-urlencoded\r\n"
-     if (proxy.user) {
+               "Content-length: %d\r\n"
-         _snprintf (request, reqlen-1,
+               "\r\n"
-                    "POST http://%s:%d/pks/add HTTP/1.0\r\n"
+               "keytext=%s"
-                    "Referer: \r\n"
+               "\r\n";
-                    "User-Agent: WinPT/W32\r\n"
+         reqlen += strlen (fmt) + strlen (proxy.base64_user) + 1;
-                    "Host: %s:%d\r\n"
+         request = safe_alloc (reqlen+1);
-                    "Proxy-Authorization: Basic %s\r\n"
+         _snprintf (request, reqlen, fmt,
-                    "Content-type: application/x-www-form-urlencoded\r\n"
+                    skip_type_prefix (hostname), port, hostname, port,
-                    "Content-length: %d\r\n"
-                    "\r\n"
-                    "keytext=%s"
-                    "\n",
-                    skip_type_prefix (hostname), port, hostname, port,
                     proxy.base64_user, enc_octets+9, enc_pubkey);
      }
      else {
-         _snprintf (request, reqlen-1,
+         fmt = "POST /pks/add HTTP/1.0\r\n"
-                    "POST /pks/add HTTP/1.0\r\n"
+               "Referer: \r\n"
-                    "Referer: \r\n"
+               "User-Agent: WinPT/W32\r\n"
-                    "User-Agent: WinPT/W32\r\n"
+               "Host: %s:%d\r\n"
-                    "Host: %s:%d\r\n"
+               "Content-type: application/x-www-form-urlencoded\r\n"
-                    "Content-type: application/x-www-form-urlencoded\r\n"
+               "Content-length: %d\r\n"
-                    "Content-length: %d\r\n"
+               "\r\n"
-                    "\r\n"
+               "keytext=%s"
-                    "keytext=%s"
+               "\r\n";
-                    "\n",
+         reqlen += strlen (fmt)+1;
-                    skip_type_prefix (hostname), port, enc_octets+9, enc_pubkey);
+         request = safe_alloc (reqlen+1);
+         _snprintf (request, reqlen, fmt,
+                    skip_type_prefix (hostname), port,
+                    enc_octets+9, enc_pubkey);
      }
-     free_if_alloc (enc_pubkey);
-     log_debug ("%s\n", request);
+     free_if_alloc (enc_pubkey);
+     log_debug ("request:\r\n%s\r\n", request);
      return request;
- } /* kserver_send_request */
+ }
- /* Interface receiving a public key. */
+ /* Interface for receiving a public key. */
  int
- kserver_recvkey (const char *hostname, u16 port, const char *keyid, char *key, int maxkeylen)
+ kserver_recvkey (const char *hostname, WORD port, const char *keyid,
- {
+                  char **r_key, size_t *r_keylen)
-     int rc, n;
+ {
+     StringBuffer req;
+     const char *reqbuf;
      int conn_fd;
-     char *request = NULL;
+     int rc;
      if (!port)
          port = HKP_PORT;
      hkp_err = 0; /* reset */
      rc = kserver_connect (hostname, port, &conn_fd);
      if (rc)
          goto leave;
-     request = new char[300+1];
-     if (!request)
-         BUG (0);
-     if (proxy.host && proxy.user) {
-         _snprintf (request, 300,
-             "GET http://%s:%d/pks/lookup?op=get&search=%s HTTP/1.0\r\n"
-             "Proxy-Authorization: Basic %s\r\n\r\n",
-             skip_type_prefix (hostname), port, keyid, proxy.base64_user);
-     }
-     else if (proxy.host) {
-         _snprintf (request, 300,
-             "GET http://%s:%d/pks/lookup?op=get&search=%s HTTP/1.0\r\n\r\n",
-             skip_type_prefix (hostname), port, keyid);
-     }
-     else {
-         _snprintf (request, 300,
-             "GET /pks/lookup?op=get&search=%s HTTP/1.0\r\n\r\n", keyid);
-     }
-     log_debug ("%s\r\n", request);
+     if (proxy.host && proxy.user && proxy.proto == PROXY_PROTO_HTTP) {
+         req = req + "GET http://" + skip_type_prefix (hostname) +
+             ":" + port +
+             "/pks/lookup?op=get&search=" + keyid + " HTTP/1.0\r\n" +
+             "Proxy-Authorization: Basic " + proxy.base64_user + "\r\n\r\n";
+     }
+     else if (proxy.host && proxy.proto == PROXY_PROTO_HTTP) {
+         req = req + "GET http://" + skip_type_prefix (hostname) +
+             ":" + port + "/pks/lookup?op=get&search=" + keyid +
+             " HTTP/1.0\r\n\r\n";
+     }
+     else
+         req = req + "GET /pks/lookup?op=get&search=" + keyid +
+             " HTTP/1.0\r\n\r\n";
-     rc = sock_write (conn_fd, request, strlen (request));
+     log_debug ("req:\r\n%s\r\n", req.getBuffer ());
+     reqbuf = req.getBuffer ();
+     rc = sock_write (conn_fd, reqbuf, strlen (reqbuf));
      if (rc == SOCKET_ERROR) {
          rc = WPTERR_WINSOCK_RECVKEY;
          goto leave;
      }
-     rc = sock_read( conn_fd, key, maxkeylen, &n );
+     rc = sock_read_ext (conn_fd, r_key, r_keylen);
-     if( rc == SOCKET_ERROR ) {
+     if (rc == SOCKET_ERROR) {
          rc = WPTERR_WINSOCK_RECVKEY;
          goto leave;
      }
-     log_debug("%s\r\n", key);
+     log_debug ("response:\r\n%s\r\n", *r_key);
-     rc = check_hkp_response (key, 1);
+     rc = check_hkp_response (*r_key, 1);
      if (rc)
          goto leave;
-Line 795 
 kserver_recvkey (const char *hostname, u
+Line 1005 
 kserver_recvkey (const char *hostname, u
  leave:
      closesocket (conn_fd);
-     free_if_alloc (request);
      return rc;
- } /* kserver_recvkey */
+ }
  /* Interface to send a public key. */
  int
- kserver_sendkey (const char *hostname, u16 port, const char *pubkey, int len )
+ kserver_sendkey (const char *hostname, WORD port,
+                  const char *pubkey, size_t len)
  {
-     int n, rc;
-     int conn_fd;
      char *request = NULL;
-     char log[2048];
+     char log[2048] = {0};
+     int conn_fd, n;
+     int rc;
      hkp_err = 0; /* reset */
      rc = kserver_connect (hostname, port, &conn_fd);
-Line 815 
 kserver_sendkey (const char *hostname, u
+Line 1025 
 kserver_sendkey (const char *hostname, u
          goto leave;
      request = kserver_send_request (hostname, port, pubkey, len);
-     if (request == NULL) {
+     rc = sock_write (conn_fd, request, strlen (request));
-         rc = WPTERR_GENERAL;
+     if (rc == SOCKET_ERROR) {
-         goto leave;
-     }
-     rc = sock_write( conn_fd, request, lstrlen(request) );
-     if( rc == SOCKET_ERROR ) {
          rc = WPTERR_WINSOCK_SENDKEY;
          goto leave;
      }
-     rc = sock_read( conn_fd, log, sizeof (log)-1, &n );
+     rc = sock_read (conn_fd, log, DIM (log)-1, &n);
-     if( rc == SOCKET_ERROR ) {
+     if (rc == SOCKET_ERROR) {
          rc = WPTERR_WINSOCK_SENDKEY;
          goto leave;
      }
-     log_debug ("kserver_sendkey:\r\n%s\r\n", log);
+     log_debug ("kserver_sendkey: read %d bytes\r\n%s\r\n", n, log);
      rc = check_hkp_response (log, 0);
-     if( rc )
+     if (rc)
          goto leave;
      WSASetLastError (0);
  leave:
      closesocket (conn_fd);
      free_if_alloc (request);
      return rc;
- } /* kserver_sendkey */
+ }
+ /* Check keyserver response. */
+ static int
+ kserver_search_chkresp (int fd)
+ {
+     char buf[128];
+     int n=0;
+     /* parse response 'HTTP/1.0 500 OK' */
+     if (sock_getline (fd, buf, DIM (buf)-1, &n))
+         return WPTERR_KEYSERVER_NOTFOUND;
+     log_debug ("kserver_search_chkpresp: %s\r\n", buf);
+     if (strncmp (buf, "HTTP/1.", 7))
+         return WPTERR_KEYSERVER_NOTFOUND;
+     if (strncmp (buf+(8+1), "200", 3))
+         return WPTERR_KEYSERVER_NOTFOUND;
+     return 0;
+ }
+ /* End the keyserver search procedure. */
+ void
+ kserver_search_end (int conn_fd)
+ {
+     log_debug ("kserver_search_end: fd=%d\r\n", conn_fd);
+     closesocket (conn_fd);
+ }
+ /* Extract the amount of keys from the info record. */
+ static size_t
+ count_keys_in_response (char *buf)
+ {
+     char *p;
+     int recno = 0;
+     size_t n = 0;
+     /* info:1:4 */
+     if (strncmp (buf, "info", 4))
+         return 0;
+     p = strtok (buf, ":");
+     while (p != NULL) {
+         recno++;
+         if (recno == 3)
+             n = atoi (p);
+         p = strtok (NULL, ":");
+     }
+     return n;
+ }
+ /* Start the keyserver search.
+    Connect to host @hostname and port @port.
+    The pattern are given in @pattern.
+    The socket is returned in @conn_fd and @nkeys contains
+    the amount of keys which were found. */
  int
- kserver_search_init (const char * hostname, u16 port, const char * keyid, int * conn_fd)
+ kserver_search_begin (const char *hostname, WORD port,
+                       const char *pattern, int *conn_fd, size_t *nkeys)
  {
+     StringBuffer req;
+     const char *reqbuf;
+     char *enc_patt = NULL;
+     char status[128];
      int rc, sock_fd;
-     int n=0;
+     int nread;
-     char * request = NULL;
+     *conn_fd = 0;
      rc = kserver_connect (hostname, port, &sock_fd);
-     if (rc) {
+     if (rc)
-         *conn_fd = 0;
          goto leave;
-     }
+     enc_patt = URL_encode (pattern, strlen (pattern), NULL);
-     n=300;
+     if (proxy.host && proxy.user && proxy.proto == PROXY_PROTO_HTTP) {
-     request = new char[n+1];
+         req = req + "GET http://" + skip_type_prefix (hostname) + ":" + port +
-     if (!request)
+             "/pks/lookup?options=mr&op=index&search=" + enc_patt +
-         BUG (0);
+             " HTTP/1.0\r\n"
+             "Proxy-Authorization: Basic " + proxy.base64_user + "\r\n\r\n";
-     if (proxy.host && proxy.user) {
-         _snprintf (request, n,
-             "GET http://%s:%d/pks/lookup?op=index&search=%s HTTP/1.0\r\n"
-             "Proxy-Authorization: Basic %s\r\n\r\n",
-             skip_type_prefix (hostname), port, keyid, proxy.base64_user);
      }
-     else if (proxy.host) {
+     else if (proxy.host && proxy.proto == PROXY_PROTO_HTTP) {
-         _snprintf (request, n,
+         req = req + "GET http://" + skip_type_prefix (hostname) + ":" + port +
-             "GET http://%s:%d/pks/lookup?op=index&search=%s HTTP/1.0\r\n\r\n",
+             "/pks/lookup?options=mr&op=index&search=" + enc_patt +
-             skip_type_prefix (hostname), port, keyid);
+             " HTTP/1.0\r\n\r\n";
      }
      else {
-         _snprintf (request, n,
+         req = req + "GET /pks/lookup?options=mr&op=index&search=" +
-                    "GET /pks/lookup?op=index&search=%s HTTP/1.0\r\n\r\n", keyid);
+             enc_patt + " HTTP/1.0\r\n\r\n";
      }
-     log_debug ("kserver_search_init:\r\n%s\r\n", request);
+     log_debug ("kserver_search_begin:\r\n%s\r\n", req.getBuffer ());
+     reqbuf = req.getBuffer ();
-     if (sock_write (sock_fd, request, strlen (request)) == SOCKET_ERROR) {
+     if (sock_write (sock_fd, reqbuf, strlen (reqbuf)) == SOCKET_ERROR) {
          rc = WPTERR_GENERAL;
          goto leave;
      }
+     rc = kserver_search_chkresp (sock_fd);
+     if (rc) {
+         closesocket (sock_fd);
+         sock_fd = 0;
+         goto leave;
+     }
+     /* Skip all lines until we reach the "info:" record. */
+     for (;;) {
+         if (sock_getline (sock_fd, status, DIM (status)-1, &nread)) {
+             log_debug ("kserver_search_begin: retrieving status line failed.\r\n");
+             closesocket (sock_fd);
+             sock_fd = 0;
+             rc = WPTERR_GENERAL;
+             break;
+         }
+         if (!strncmp (status, "info:", 5))
+             break;
+     }
+     if (!rc)
+         *nkeys = count_keys_in_response (status);
      *conn_fd = sock_fd;
  leave:
-     free_if_alloc (request);
+     free_if_alloc (enc_patt);
      return rc;
- } /* kserver_search_init */
+ }
- int
+ /* Parse a single pub record returned by the keyserver. */
- kserver_search_chkresp (int fd)
+ static void
+ parse_pub_record (keyserver_key_s *key, char *buf)
  {
-     char buf[128];
+     enum pub_rec_t {ID=1, KEYID, ALGO, SIZE, CREATE, EXPIRE};
-     int n=0;
+     char *p;
+     int recno = 0;
-     /* parse response 'HTTP/1.0 500 OK' */
+     int off = 0;
-     if (sock_getline (fd, buf, 127, &n))
-         return WPTERR_KEYSERVER_NOTFOUND;
+     /* pub:{BF3DF9B4, ED4681C9BF3DF9B4, FPR}:17:1024:925411133:: */
+     p = strtok (buf, ":");
+     while (p != NULL) {
+         recno++;
+         switch (recno) {
+         case ID:
+             break;
-     log_debug ("kserver_search_chkpresp: %s\r\n", buf);
+         case KEYID:
-     if (strncmp (buf, "HTTP/1.", 7))
+             /* If for any reason the returned record actually contains
-         return WPTERR_KEYSERVER_NOTFOUND;
+                a fingerprint instead of a key ID, we truncate the fpr. */
-     if (strncmp (buf+(8+1), "200", 3))
+             off = strlen (p) == 40? 32 : 0;
-         return WPTERR_KEYSERVER_NOTFOUND;
+             free_if_alloc (key->keyid);
-     return 0;
+             key->keyid = m_strdup (p+off);
- } /* kserver_search_chkresp */
+             break;
+         case ALGO:
+             key->algo = atoi (p);
+             break;
+         case SIZE:
+             key->bits = atoi (p);
+             break;
- int
+         case CREATE:
- kserver_search (int fd, keyserver_key * key)
+             key->creation = strtoul (p, NULL, 10);
+             break;
+         case EXPIRE:
+             key->expires = strtoul (p, NULL, 10);
+             break;
+         }
+         p = strtok (NULL, ":");
+     }
+ }
+ /* Parse a single user id returned by the keyserver. */
+ static void
+ parse_uid_record (keyserver_key_s *key, char *buf)
  {
-     char buf[1024], *p;
+     enum uid_rec_t {ID=1, UID, CREATE, EXPIRE};
-     int uidlen, nbytes, pos = 0;
+     keyserver_uid_s *u, *n;
+     char *p, *raw;
+     int recno = 0;
+     /* uid:Timo Schulz <[email protected]>:1138440360:: */
+     u = new keyserver_uid_s;
+     memset (u, 0, sizeof *u);
+     p = strtok (buf, ":");
+     while (p != NULL) {
+         recno++;
-     log_debug ("keyserver_search:\n");
+         switch (recno) {
+         case ID:
-     if (sock_getline (fd, buf, sizeof (buf) - 1, &nbytes))
+             break;
-         return WPTERR_GENERAL;
-     log_debug ("%s\n", buf);
+         case UID:
+             unhexify_buffer (p, &raw);
-     if (!strncmp (buf, "pub", 3)) {
+             u->uid = utf8_to_native (raw);
-         int revoked = strstr (buf, "KEY REVOKED") != NULL? 1 : 0;
+             free_if_alloc (raw);
-         key->bits = atol (buf+3);
+             break;
-         p = strchr (buf, '>');
-         if (!p)
+         case CREATE:
-             goto fail;
+             u->creation = strtoul (p, NULL, 10);
-         pos = p - buf + 1;
+             break;
-         memcpy (key->keyid, buf + pos, 8);
-         key->keyid[8] = '\0';
+         case EXPIRE:
-         p = strstr (buf, "</a>");
+             u->expires = strtoul (p, NULL, 10);
-         if (!p)
+             break;
-             goto fail;
-         pos = p - buf + 5;
-         memcpy (key->date, buf + pos, 10);
-         key->date[10] = '\0';
-         if (revoked) {
-             strcpy (key->uid, "KEY REVOKED: not checked");
-             return 0;
-         }
-         pos += 10;
-         p = buf + pos + 1;
-         while (p && *p != '>')
-             p++;
-         p++;
-         uidlen = strlen (p) - 10;
-         memcpy (key->uid, p, uidlen);
-         key->uid[uidlen] = '\0';
-         strcat (key->uid, ">");
-         p = strchr (key->uid, '&');
-         if (p) {
-             key->uid[(p-key->uid)] = '<';
-             memmove (key->uid+(p-key->uid)+1, key->uid+(p-key->uid)+4, strlen (key->uid)-3);
          }
-         return 0;
-     }
- fail:
+         p = strtok (NULL, ":");
-     key->bits = 0;
+     }
-     memset (key, 0, sizeof *key);
+     if (!key->uids)
-     return 0;
+         key->uids = u;
- } /* kserver_search */
+     else {
+         for (n = key->uids; n->next; n=n->next)
+             ;
+         n->next = u;
+     }
+ }
+ /* Peek the next 3 bytes to check if the next line
+    would be a new "pub" record. In this case, return
+    -1 as an EOF indication, 0 otherwise. */
  static int
- add_node( keyserver_cfgfile *cfg, const char *entry )
+ is_key_eof (int fd)
  {
-     keyserver_node *node;
+     char buf[64];
-     char *p = NULL;
+     int n;
-     p = strchr( entry, '=' );
-     if( p == NULL )
-         return WPTERR_GENERAL;
-     node = new keyserver_node;
-     if( !node )
-         BUG( NULL );
-     memset( node, 0, sizeof *node );
-     node->used = 1;
-     node->host.used = 1;
-     node->host.proto = proto_from_URL( entry );
-     memcpy( node->host.name, entry+7, p-entry-7 );
-     node->next = cfg->list;
-     cfg->list = node;
-     return 0;
- } /* add_node */
- void
+     n = recv (fd, buf, 3, MSG_PEEK);
- kserver_change_proxy( keyserver_proxy_ctx *ctx )
+     if (n < 3 || strncmp (buf, "pub", 3))
- {
+         return 0;
-     proxy.port = ctx->port;
+     return -1;
-     free_if_alloc (proxy.host);
+ }
-     proxy.host = ctx->host? m_strdup( ctx->host ) : NULL;
-     free_if_alloc( proxy.pass );
-     proxy.pass = ctx->pass? m_strdup( ctx->pass ) : NULL;
-     free_if_alloc( proxy.user );
-     proxy.user = ctx->user? m_strdup( ctx->user ) : NULL;
-     set_reg_proxy_prefs( proxy.host, proxy.port, proxy.user, proxy.pass );
- } /* kserver_change_proxy */
+ /* Return the next key from the search response. */
  int
- kserver_read_config( const char *fname, keyserver_cfgfile **ret_cfg )
+ kserver_search_next (int fd, keyserver_key_s **r_key)
  {
-     FILE *fp;
+     keyserver_uid_s *uid, *u = NULL;
-     keyserver_cfgfile *cfg;
+     keyserver_key_s *key;
-     char buf[256];
+     char buf[512];
-     int rc = 0;
+     int n = 0;
+     long max = 0;
-     *ret_cfg = NULL;
-     fp = fopen( fname, "rb" );
+     log_debug ("keyserver_search_next:\r\n");
-     if( fp == NULL )
+     *r_key = NULL;
-         return WPTERR_FILE_OPEN;
+     key = new keyserver_key_s;
-     cfg = new keyserver_cfgfile;
+     memset (key, 0, sizeof *key);
-     if ( !cfg )
+     for (;;) {
-         BUG( NULL );
+         if (sock_getline (fd, buf, DIM (buf)-1, &n))
-     memset( cfg, 0, sizeof *cfg );
+             break;
+         /*log_debug ("record: '%s'\r\n", buf); */
-     while ( !feof( fp ) ) {
+         if (!strncmp (buf, "pub", 3))
-         if ( fgets( buf, sizeof(buf)-1, fp ) == NULL )
+             parse_pub_record (key, buf);
-             break;
+         else
-         if ( *buf == '\r' || *buf == '\n' || *buf == '#' )
+             parse_uid_record (key, buf);
-             continue;
+         if (is_key_eof (fd))
-         buf[strlen(buf) -2] = '\0';
+             break;
-         if ( !strncmp( buf, "use_proxy=", 10 ) ) {
-             char *p = strchr(buf, ':');
-             if (!p)
-                 continue;
-             cfg->proxy.port = atol( buf+(p-buf+1) );
-             buf[p-buf] = '\0';
-             cfg->proxy.host = m_strdup( buf+10 );
-         }
-         else if ( !strncmp( buf, "proxy_user=", 11 ) )
-             cfg->proxy.user = m_strdup( buf+11 );
-         else if ( !strncmp( buf, "proxy_pass=", 11 ) )
-             cfg->proxy.pass = m_strdup( buf+11 );
-         if ( !strncmp( buf, "http://", 7 )
-             || !strncmp( buf, "hkp://", 6 )
-             || !strncmp( buf, "ldap://", 7 ) ) {
-             add_node( cfg, buf );
-             cfg->nlist++;
-         }
      }
-     fclose( fp );
-     *ret_cfg = cfg;
-     return rc;
- } /* kserver_read_config */
+     /* the uid with the newest self sig is used as the
+        primary user id. */
+     for (uid = key->uids; uid; uid = uid->next) {
+         if (uid->creation > max) {
+             max = uid->creation;
+             u = uid;
+         }
+     }
- int
+     key->main_uid = u? u : key->uids;
- kserver_write_config( const char * fname, keyserver_cfgfile * cfg )
+     *r_key = key;
- {
      return 0;
  }
+ /* Release the keyserver key @key and all its elements. */
  void
- kserver_cfgfile_release( keyserver_cfgfile *cfg )
+ kserver_release_key (keyserver_key_s *key)
  {
-     keyserver_node *k, *k2;
+     keyserver_uid_s *u;
-     proxy_release( &cfg->proxy );
+     while (key->uids) {
-     for( k = cfg->list; cfg->nlist--; k = k2 ) {
+         u = key->uids->next;
-         k2 = k->next;
+         free_if_alloc (key->uids->uid);
-         free_if_alloc( k );
+         free_if_alloc (key->uids);
+         key->uids = u;
      }
-     free_if_alloc( cfg );
+     free_if_alloc (key->keyid);
- } /* kserver_cfgfile_release */
+     free_if_alloc (key);
+ }
+ /* Release mbmers in the proxy context @ctx. */
  void
- proxy_release( keyserver_proxy_ctx *ctx )
+ kserver_proxy_release (keyserver_proxy_t ctx)
  {
-     free_if_alloc( ctx->host );
+     free_if_alloc (ctx->host);
-     free_if_alloc( ctx->pass );
+     free_if_alloc (ctx->pass);
-     free_if_alloc( ctx->user );
+     free_if_alloc (ctx->user);
- } /* proxy_release */
+     ctx->port = ctx->proto = 0;
+ }
- int
+ /* Spawn a process given by @cmdl. */
- ldap_recvkey (const char * host, const char * keyid, char * key, int maxkeylen)
+ static int
+ spawn_application (char *cmdl)
  {
-     const char *s;
-     char *ksprg = NULL, *p = NULL;
-     char temp[512], outf[512];
-     FILE * inp;
-     int rc, start_key = 0;
      STARTUPINFO si;
      PROCESS_INFORMATION pi;
+     int rc = 0;
+     memset (&si, 0, sizeof (si));
+     si.cb = sizeof (si);
+     si.dwFlags = STARTF_USESHOWWINDOW;
+     si.wShowWindow = SW_HIDE;
+     memset (&pi, 0, sizeof (pi));
+     if (!CreateProcess (NULL, cmdl, NULL, NULL, FALSE, 0,
+                         NULL, NULL, &si, &pi)) {
+         log_box ("Keyserver Plugin", MB_ERR, "Could not spawn helper process");
+         rc = -1;
+     }
-     p = get_gnupg_path ();
+     CloseHandle (pi.hThread);
-     ksprg = new char[strlen (p) + 1 + 128];
+     WaitForSingleObject (pi.hProcess, INFINITE);
+     CloseHandle (pi.hProcess);
+     return rc;
+ }
+ static FILE*
+ do_spawn_ldap_helper (const char *host, const char *keyid)
+ {
+     FILE *fp = NULL;
+     StringBuffer cmd;
+     char *sep, *p, *ksprg;
+     char outf[256], inf[256];
+     size_t n;
+     p = get_gnupg_prog ();
+     n = strlen (p) + 1 + 128;
+     ksprg = safe_alloc (n+1);
      if (!ksprg)
          BUG (0);
-     strcpy (ksprg, p);
+     sep = strrchr (p, '\\');
-     strcat (ksprg, "\\");
+     if (sep != NULL)
-     strcat (ksprg, "gpgkeys_ldap.exe");
+         p[(sep-p)] = 0;
+     _snprintf (ksprg, n, "%s\\gpgkeys_ldap.exe", p);
      free_if_alloc (p);
      if (file_exist_check (ksprg)) {
-         log_box ( "LDAP Keyserver Plugin", MB_ERR, "Could not find LDAP keyserver module!");
+         log_box ("LDAP Keyserver Plugin", MB_ERR,
-         rc = -1;
+                  "%s: could not find LDAP keyserver module!", ksprg);
+         fp = NULL;
          goto leave;
      }
-     GetTempPath (sizeof (temp)-1, temp);
+     get_temp_name (outf, DIM (outf)-1, keyid);
-     strcpy (outf, temp);
+     get_temp_name (inf, DIM (inf)-1, NULL);
-     strcat (outf, keyid);
+     fp = fopen (inf, "w+b");
-     strcat (outf, ".out");
+     if (!fp) {
-     strcat (temp, keyid);
+         log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", inf,
-     inp = fopen (temp, "w+b");
-     if( !inp ) {
-         log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", temp,
                   winpt_strerror (WPTERR_FILE_OPEN));
-         rc = -1;
          goto leave;
      }
-     fprintf (inp,
+     fprintf (fp,
-         "VERSION 0\n"
+         "VERSION 1\n"
+         "PROGRAM %d.%d.%d\n"
+         "SCHEME ldap\n"
          "HOST %s\n"
-         "OPTION verbose\n"
          "COMMAND GET\n"
          "\n"
-         "%s\n", host? skip_type_prefix (host): "64.94.85.200", keyid);
+         "%s\n",
-     fclose (inp);
+         gpgver[0], gpgver[1], gpgver[2],
+         host? skip_type_prefix (host): "64.94.85.200", keyid);
-     memset (&si, 0, sizeof (si));
+     fclose (fp);
-     si.cb = sizeof (si);
-     si.dwFlags = STARTF_USESHOWWINDOW;
+     cmd = ksprg;
-     si.wShowWindow = SW_HIDE;
+     cmd = cmd + " -o " + outf + " " + inf;
-     memset (&pi, 0, sizeof (pi));
+     if (spawn_application ((char*)cmd.getBuffer ())) {
-     p = new char[strlen (ksprg) + strlen (temp) + strlen (outf) + 32];
+         fp = NULL;
-     sprintf (p, "%s -o %s %s", ksprg, outf, temp);
-     rc = CreateProcess (NULL, p, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
-     if (!rc) {
-         log_box ("LDAP Keyserver Plugin", MB_ERR, "Could not spawn process");
-         rc = -1;
          goto leave;
      }
-     CloseHandle (pi.hThread);
+     fp = fopen (outf, "rb");
-     WaitForSingleObject (pi.hProcess, INFINITE);
+     if (!fp)
-     CloseHandle (pi.hProcess);
-     inp = fopen (outf, "rb");
-     if (!inp) {
          log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", outf,
                   winpt_strerror (WPTERR_FILE_OPEN));
-         rc = -1;
-         goto leave;
+ leave:
-     }
+     DeleteFile (inf);
-     memset (key, 0, maxkeylen);
+     DeleteFile (outf);
-     while( !feof( inp ) ) {
+     free_if_alloc (ksprg);
-         s = fgets( temp, sizeof (temp)-1, inp );
+     return fp;
-         if( !s )
+ }
+ /* Receive an key via LDAP from host @host with the keyid @keyid.
+    @key contains the key on success. */
+ int
+ ldap_recvkey (const char *host, const char *keyid,
+               char **r_key, size_t *r_keylen)
+ {
+     gpgme_data_t raw;
+     FILE *fp;
+     const char *s;
+     char buf[512];
+     int start_key = 0, failed = 0;
+     int rc = 0;
+     fp = do_spawn_ldap_helper (host, keyid);
+     if (!fp)
+         return WPTERR_GENERAL;
+     if (gpgme_data_new (&raw))
+         BUG (0);
+     while (!feof (fp)) {
+         s = fgets (buf, DIM (buf)-1, fp);
+         if (!s)
              break;
-         if( !start_key && strstr( s, "KEY" ) && strstr( s, "BEGIN" ) ) {
+         if (strstr (s, "KEY") && strstr (s, "FAILED")) {
+             failed = 1;
+             break;
+         }
+         if (!start_key && strstr (s, "KEY") && strstr (s, "BEGIN")) {
              start_key = 1;
              continue;
          }
-         if( !start_key )
+         if (!start_key)
              continue;
-         strcat( key, temp );
+         gpgme_data_write (raw, buf, strlen (buf));
-         maxkeylen -= strlen( temp );
+         if (strstr (s, "KEY") && strstr (s, "END"))
-         if( maxkeylen < 0 || (strstr( s, "KEY" ) && strstr( s, "END" )) )
              break;
      }
-     fclose( inp );
+     fclose (fp);
- leave:
+     if (failed)
-     if( !strlen( key ) )
          rc = WPTERR_WINSOCK_RECVKEY;
-     free_if_alloc( p );
+     *r_key = data_release_and_get_mem (raw, r_keylen);
-     free_if_alloc( ksprg );
      return rc;
- } /* ldap_recvkey */
- static int
- finger_readline (int fd, char * buf, int nbytes)
- {
-     char c = 0;
-     int n, pos = 0;
-     while (nbytes > 0) {
-         n = recv (fd, &c, 1, 0);
-         if (n <= 0)
-             break;
-         if (c == '\n')
-             break;
-         buf[pos++] = c;
-         nbytes--;
-     }
-     if (nbytes > 0)
-         buf[pos++] = '\0';
-     if (n <= 0)
-         pos = n;
-     return pos;
  }
+ /* Receive an key via FINGER from host @host with the user @user.
+    On success @key contains the key. */
  int
- finger_recvkey (const char * host, const char * user, char * key, int maxkeylen)
+ finger_recvkey (const char *host, const char *user,
+                 char **r_key, size_t *r_keylen)
  {
-     struct hostent * hp;
+     gpgme_data_t raw;
-     struct sockaddr_in saddr;
+     char buf[256+1];
-     char buf[128];
      int fd, nread;
      int start_key = 0;
      int rc=0;
-     fd = socket (PF_INET, SOCK_STREAM, 0);
+     rc = kserver_connect (host, FINGER_PORT, &fd);
-     if (fd == -1)
+     if (rc)
-         return WPTERR_WINSOCK_SOCKET;
+         return rc;
-     hp = gethostbyname (skip_type_prefix (host));
-     if (!hp) {
-         closesocket (fd);
-         return WPTERR_WINSOCK_RESOLVE;
-     }
-     memset (&saddr, 0, sizeof (saddr));
+     sock_write (fd, user, strlen (user));
-     saddr.sin_family = AF_INET;
+     sock_write (fd, "\r\n", 2);
-     saddr.sin_port = htons (FINGER_PORT);
-     saddr.sin_addr = *(struct in_addr *)hp->h_addr;
+     if (gpgme_data_new (&raw))
-     if (connect (fd, (struct sockaddr *)&saddr, sizeof (saddr))) {
+         return WPTERR_WINSOCK_RECVKEY;
-         closesocket (fd);
-         return WPTERR_WINSOCK_CONNECT;
+     for (;;) {
-     }
+         if (sock_getline (fd, buf, DIM (buf)-1, &nread))
-     send (fd, user, strlen (user), 0);
+             break;
-     send (fd, "\r\n", 2, 0);
-     memset (key, 0, maxkeylen);
-     while (maxkeylen > 0) {
-         nread = finger_readline (fd, buf, sizeof (buf)-1);
-         if (nread <= 0)
-             break;
          strcat (buf, "\n");
          if (strstr (buf, "BEGIN PGP PUBLIC KEY BLOCK")) {
-             strcat (key, buf);
+             gpgme_data_write (raw, buf, nread);
              start_key = 1;
-             maxkeylen -= nread;
          }
          else if (strstr (buf, "END PGP PUBLIC KEY BLOCK" ) && start_key) {
-             strcat (key, buf);
+             gpgme_data_write (raw, buf, nread);
              start_key--;
-             maxkeylen -= nread;
              break;
          }
-         else if (start_key) {
+         else if (start_key)
-             strcat (key, buf);
+             gpgme_data_write (raw, buf, nread);
-             maxkeylen -= nread;
-         }
      }
      closesocket (fd);
      if (start_key != 0)
          rc = WPTERR_WINSOCK_RECVKEY;
+     *r_key = data_release_and_get_mem (raw, r_keylen);
      return rc;
  }
+ /* Check if the given name @name is a valid inernet address
+    which means an dotted IP or a valid DNS name.
+    Return value: 0 on success. */
  int
- check_IP_or_hostname (const char *name)
+ check_inet_address (const char *addr)
  {
      const char *not_allowed = "=!�$%&@#*~\\/}][{<>|,;:'";
-     size_t i, j;
+     size_t i;
-     for (i=0; i < strlen (name); i++) {
+     for (i=0; i < strlen (addr); i++) {
-         for (j =0; j < strlen (not_allowed); j++) {
+         if (strchr (not_allowed, addr[i]))
-             if (name[i] == not_allowed[j])
+             return -1;
-                 return -1;
+     }
-         }
+     return 0;
+ }
+ /* Split the URL @r_keyserver into the host and the port
+    part if possible. */
+ gpgme_error_t
+ parse_keyserver_url (char **r_keyserver, unsigned short *r_port)
+ {
+     char *p;
+     char *url = *r_keyserver;
+     int off = 0;
+     /* no port is given so use the default port. */
+     p = strrchr (url, ':');
+     if (p == strchr (url, ':')) {
+         int port = port_from_proto (proto_from_URL (url));
+         if (!port)
+             port = HKP_PORT;
+         *r_port = port;
+         return 0;
      }
+     if (url[(p-url)-1] == '/') /* remove / in .de/:11371 */
+         off = 1;
+     *r_keyserver = substr (url, 0, (p-url)-off);
+     *r_port = atoi (url+(p-url)+1);
+     free_if_alloc (url);
      return 0;
  }

 Legend:



Removed from v.73
 


changed lines


 
Added in v.290
 Legend:



Removed from v.73
 


changed lines


 
Added in v.290
-Removed from v.73
+Added in v.290

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26