/[winpt]/trunk/Src/wptKeyserverDlg.cpp
ViewVC logotype

Diff of /trunk/Src/wptKeyserverDlg.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 165 by twoaday, Tue Jan 24 10:10:15 2006 UTC revision 195 by twoaday, Mon Apr 3 17:10:47 2006 UTC
# Line 1  Line 1 
1  /* wptKeyserverDlg.cpp - Keyserver dialog  /* wptKeyserverDlg.cpp - Keyserver dialog
2   *      Copyright (C) 2000-2005 Timo Schulz   *      Copyright (C) 2000-2006 Timo Schulz
3   *      Copyright (C) 2005 g10 Code GmbH   *      Copyright (C) 2005 g10 Code GmbH
4   *   *
5   * This file is part of WinPT.   * This file is part of WinPT.
# Line 35  Line 35 
35  #include "wptW32API.h"  #include "wptW32API.h"
36  #include "wptVersion.h"  #include "wptVersion.h"
37  #include "wptGPG.h"  #include "wptGPG.h"
38    #include "wptGPGME.h"
39  #include "wptKeyManager.h"  #include "wptKeyManager.h"
40  #include "wptContext.h" /* for passphrase_s */  #include "wptContext.h" /* for passphrase_s */
41  #include "wptDlgs.h"  #include "wptDlgs.h"
42  #include "wptUTF8.h"  #include "wptUTF8.h"
43    
44  #define MAX_KEYSIZE 70000  #define MAX_KEYSIZE 80000
45    
46  char* get_reg_entry_keyserver (const char *);  char* get_reg_entry_keyserver (const char *);
47  int set_reg_entry_keyserver (const char *, const char *);  int set_reg_entry_keyserver (const char *, const char *);
48    
49  enum { KS_COL_NAME = 0, KS_COL_PORT, KS_COL_DEFAULT };  enum { KS_COL_NAME = 0, KS_COL_PORT };
50    
51  /* Callback context to modify (add, edit) keyserver items. */  /* Callback context to modify (add, edit) keyserver items. */
52  struct keyserver_rec_s {  struct keyserver_rec_s {
# Line 76  hkp_err_box (HWND dlg, const char *host, Line 77  hkp_err_box (HWND dlg, const char *host,
77  int  int
78  hkp_send_key (HWND dlg, const char *kserver, WORD port, const char *pattern)  hkp_send_key (HWND dlg, const char *kserver, WORD port, const char *pattern)
79  {  {
80      gpgme_ctx_t ctx;      GPGME *gpg;
     gpgme_data_t keydata;  
81      gpgme_error_t ec;      gpgme_error_t ec;
82      char *rawkey = NULL;      char *rawkey = NULL;
83      char msg[384];      char msg[384];
     size_t n;  
84            
85      ec = gpgme_new (&ctx);      gpg = new GPGME ();
86      if (ec)      gpg->setArmor (true);
87          BUG (NULL);      ec = gpg->exportToBuffer (pattern, &rawkey);
     gpgme_set_armor (ctx, 1);  
     ec = gpgme_data_new (&keydata);  
     if (ec)  
         BUG (NULL);  
     ec = gpgme_op_export (ctx, pattern, 0, keydata);  
88      if (ec) {      if (ec) {
89          msg_box (dlg, gpgme_strerror (ec), _("Export"), MB_ERR);          msg_box (dlg, gpgme_strerror (ec), _("Export"), MB_ERR);
90          goto leave;          goto leave;
91      }      }
92      rawkey = gpgme_data_release_and_get_mem (keydata, &n);      op_begin ();
93      ec = kserver_sendkey (kserver, port, rawkey, n);      ec = kserver_sendkey (kserver, port, rawkey, strlen (rawkey));
94        op_end ();
95      if (ec) {      if (ec) {
96          hkp_err_box (dlg, kserver, port, ec);          hkp_err_box (dlg, kserver, port, ec);
97          goto leave;          goto leave;
# Line 106  hkp_send_key (HWND dlg, const char *kser Line 101  hkp_send_key (HWND dlg, const char *kser
101      status_box (dlg, msg, _("GnuPG status"));      status_box (dlg, msg, _("GnuPG status"));
102            
103  leave:  leave:
104      gpgme_release (ctx);      delete gpg;
105      if (rawkey)      free_if_alloc (rawkey);
         gpgme_free (rawkey);  
106      return ec? -1 : 0;      return ec? -1 : 0;
107  }  }
108    
# Line 150  show_imported_keys (gpgme_import_result_ Line 144  show_imported_keys (gpgme_import_result_
144    
145      for (t=res->imports; t; t = t->next) {      for (t=res->imports; t; t = t->next) {
146          if (!gpgme_get_key (ctx, t->fpr, &key, 0)) {          if (!gpgme_get_key (ctx, t->fpr, &key, 0)) {
147              s = uid = utf8_to_wincp2 (key->uids->uid);              s = uid = utf8_to_native (key->uids->uid);
148              gpgme_data_write (msg, s, strlen (s));              gpgme_data_write (msg, s, strlen (s));
149              gpgme_data_write (msg, "\n", 1);              gpgme_data_write (msg, "\n", 1);
150              gpgme_key_release (key);              gpgme_key_release (key);
# Line 305  check_pattern (const char *pattern) Line 299  check_pattern (const char *pattern)
299            
300  leave:  leave:
301      return rc;      return rc;
302  } /* check_pattern */  }
303    
304    
305  static void  /* Return human readable name for the proxy protocol. */
306  set_proxy (HWND dlg)  static const char*
307    name_from_proto (int proto)
308  {  {
309      char proxy[256];      const char *s;
310      int port = 0;  
311            switch (proto) {
312      strcpy (proxy, "HTTP proxy: ");      case PROXY_PROTO_NONE:      s = ""; break;
313      if (kserver_get_proxy (&port)) {      case PROXY_PROTO_HTTP:      s = "HTTP"; break;
314          char t[128];      case PROXY_PROTO_SOCKS5:    s =  "SOCKS5"; break;
315          const char *http = kserver_get_proxy (&port);      default:                    s= "HTTP"; break;
         _snprintf (t, sizeof (t) - 1, "\"%s:%d\"", http, port);  
         strcat (proxy, t);  
316      }      }
317      else      return s;
         strcat (proxy, "none");  
     SetDlgItemText (dlg, IDC_KEYSERVER_PROXY, proxy);  
318  }  }
319    
320    
# Line 336  kserver_get_pos (listview_ctrl_t lv) Line 327  kserver_get_pos (listview_ctrl_t lv)
327  }  }
328    
329    
330  static u16 inline  static WORD inline
331  kserver_get_port (listview_ctrl_t lv)  kserver_get_port (listview_ctrl_t lv)
332  {  {
333      char buf[16];      char buf[16];
334    
335      listview_get_item_text (lv, kserver_get_pos (lv), KS_COL_PORT, buf, 15);      listview_get_item_text (lv, kserver_get_pos (lv), KS_COL_PORT, buf, 15);
336      return (u16)strtoul (buf, NULL, 10);      return (WORD)strtoul (buf, NULL, 10);
337  }  }
338    
339    
 /* Load the default keyserver and mark it in @lv. */  
340  static void  static void
341  load_default_ks (listview_ctrl_t lv)  set_default_ks (listview_ctrl_t lv)
342  {  {
343      char * p, buf[192];      char *p, buf[200];
344      int i;      int i;
345    
346      p = get_reg_entry_keyserver ("Default");      p = get_reg_entry_keyserver ("Default");
347      if (!p)      if (!p)
348          return;          return;
349      for (i = 0; i < listview_count_items( lv, 0); i++ ) {      for (i=0; i < listview_count_items (lv, 0); i++) {
350          listview_get_item_text (lv, i, KS_COL_NAME, buf, sizeof (buf)-1);          listview_get_item_text (lv, i, KS_COL_NAME, buf, sizeof (buf)-1);      
351          if (!strncmp (p, buf, strlen (p))) {          if (!strcmp (buf, p)) {
352              listview_add_sub_item (lv, i, KS_COL_DEFAULT, "x");              listview_select_one (lv, i);
353              break;              break;
354          }          }
355      }      }
# Line 379  save_default_ks (listview_ctrl_t lv) Line 369  save_default_ks (listview_ctrl_t lv)
369          return -1;          return -1;
370      }      }
371      listview_get_item_text (lv, idx, KS_COL_NAME, buf, sizeof (buf)-1);      listview_get_item_text (lv, idx, KS_COL_NAME, buf, sizeof (buf)-1);
372      if (!strncmp (buf, "http", 4) && !strncmp (buf, "hkp", 3)) {      if (strncmp (buf, "http", 4) && strncmp (buf, "hkp", 3)) {
373          msg_box (NULL, _("Only HTTP keyserver can be used."),          msg_box (NULL, _("Only HTTP keyserver can be used."),
374                   _("Keyserver"), MB_ERR);                   _("Keyserver"), MB_ERR);
375          return -1;          return -1;
376      }      }
     for (i = 0; i < listview_count_items (lv, 0); i++)  
         listview_add_sub_item (lv, i, KS_COL_DEFAULT, "");  
     listview_add_sub_item (lv, idx, KS_COL_DEFAULT, "x");  
     listview_get_item_text (lv, idx, KS_COL_NAME, buf, sizeof (buf)-1);  
377      set_reg_entry_keyserver ("Default", buf);      set_reg_entry_keyserver ("Default", buf);
378      i = kserver_get_port (lv);      i = kserver_get_port (lv);
379      sprintf (port, "%d", i);      sprintf (port, "%d", i);
380      set_reg_entry_keyserver ("Default_Port", port);      set_reg_entry_keyserver ("Default_Port", port);
381      keyserver_set_default (buf, (u16)i);      keyserver_set_default (buf, (WORD)i);
382      return 0;      return 0;
383  }  }
384    
# Line 401  int Line 387  int
387  keyserver_list_build (listview_ctrl_t *r_lv, HWND hwnd)  keyserver_list_build (listview_ctrl_t *r_lv, HWND hwnd)
388  {  {
389      struct listview_column_s keyserver[] = {      struct listview_column_s keyserver[] = {
390          {0, 160, (char *)_("DNS Name")},          {0, 180, (char *)_("DNS Name")},
391          {1,  46, (char *)_("Port")},          {1,  55, (char *)_("Port")},
         {2,  60, (char *)_("Default")},  
392          {0,   0, NULL}          {0,   0, NULL}
393      };      };
394      HICON ico[1];      HICON ico[1];
# Line 416  keyserver_list_build (listview_ctrl_t *r Line 401  keyserver_list_build (listview_ctrl_t *r
401      lv->ctrl = hwnd;      lv->ctrl = hwnd;
402      for (j=0; keyserver[j].fieldname; j++)      for (j=0; keyserver[j].fieldname; j++)
403          listview_add_column (lv, &keyserver[j]);          listview_add_column (lv, &keyserver[j]);
404      listview_set_image_list (lv, ico, 1);      listview_set_image_list (lv, 16, 16, ico, 1);
405      for (j = 0; j<MAX_KEYSERVERS; j++) {      for (j = 0; j<MAX_KEYSERVERS; j++) {
406          if (!server[j].used)          if (!server[j].used)
407              continue;              continue;
# Line 425  keyserver_list_build (listview_ctrl_t *r Line 410  keyserver_list_build (listview_ctrl_t *r
410          sprintf (buf, "%d", server[j].port);          sprintf (buf, "%d", server[j].port);
411          listview_add_sub_item (lv, 0, KS_COL_PORT, buf);          listview_add_sub_item (lv, 0, KS_COL_PORT, buf);
412      }      }
     load_default_ks (lv);  
413      if (listview_count_items (lv, 0) == 0) {      if (listview_count_items (lv, 0) == 0) {
414          listview_add_item (lv, "");          listview_add_item (lv, "");
415          listview_add_sub_item (lv, 0, KS_COL_NAME, DEF_HKP_KEYSERVER);          listview_add_sub_item (lv, 0, KS_COL_NAME, DEF_HKP_KEYSERVER);
# Line 536  keyserver_modify_dlg_proc (HWND dlg, UIN Line 520  keyserver_modify_dlg_proc (HWND dlg, UIN
520              EnableWindow (GetDlgItem (dlg, IDC_KSERVADD_TYPES), FALSE);              EnableWindow (GetDlgItem (dlg, IDC_KSERVADD_TYPES), FALSE);
521          }          }
522          else          else
523              SetDlgItemInt (dlg, IDC_KSERVADD_PORT, 11371, FALSE);              SetDlgItemInt (dlg, IDC_KSERVADD_PORT, 11371, FALSE);      
524          SetWindowText (dlg, _("Edit Keyserver"));          SetWindowText (dlg, _("Edit Keyserver"));
525          SetDlgItemText (dlg, IDOK, _("&Add"));          SetDlgItemText (dlg, IDOK, _("&Add"));
526          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
# Line 605  keyserver_dlg_proc (HWND dlg, UINT msg, Line 589  keyserver_dlg_proc (HWND dlg, UINT msg,
589          SetDlgItemText (dlg, IDC_KEYSERVER_INFO,          SetDlgItemText (dlg, IDC_KEYSERVER_INFO,
590                          _("Please enter the key ID or email address you search for"));                          _("Please enter the key ID or email address you search for"));
591          SetDlgItemText (dlg, IDC_KEYSERVER_INDEX, _("&Search"));          SetDlgItemText (dlg, IDC_KEYSERVER_INDEX, _("&Search"));
592          SetDlgItemText (dlg, IDC_KEYSERVER_PROXSETT, _("C&hange"));          SetDlgItemText (dlg, IDC_KEYSERVER_PROXSETT, _("C&hange proxy"));
593          SetDlgItemText (dlg, IDC_KEYSERVER_DEFAULT, _("Set &default"));          SetDlgItemText (dlg, IDC_KEYSERVER_DEFAULT, _("Set &default"));
594          SetDlgItemText (dlg, IDCANCEL, _("&Close"));          SetDlgItemText (dlg, IDCANCEL, _("&Close"));
595            
         set_proxy (dlg);  
596          keyserver_list_build (&lv, GetDlgItem (dlg, IDC_KEYSERVER_LIST));          keyserver_list_build (&lv, GetDlgItem (dlg, IDC_KEYSERVER_LIST));
597            set_default_ks (lv);
598          center_window (dlg, NULL);          center_window (dlg, NULL);
599          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
600          return TRUE;          return TRUE;
# Line 659  keyserver_dlg_proc (HWND dlg, UINT msg, Line 643  keyserver_dlg_proc (HWND dlg, UINT msg,
643              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSERVER_PROXY,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSERVER_PROXY,
644                                dlg, keyserver_proxy_dlg_proc, NULL,                                dlg, keyserver_proxy_dlg_proc, NULL,
645                                _("Proxy Settings"), IDS_WINPT_KEYSERVER_PROXY);                                _("Proxy Settings"), IDS_WINPT_KEYSERVER_PROXY);
             set_proxy (dlg);  
646              return TRUE;              return TRUE;
647                            
648          case IDC_KEYSERVER_INDEX:          case IDC_KEYSERVER_INDEX:
# Line 718  keyserver_dlg_proc (HWND dlg, UINT msg, Line 701  keyserver_dlg_proc (HWND dlg, UINT msg,
701                  return FALSE;                  return FALSE;
702              }              }
703              if (proto_nr == KSPROTO_LDAP && strchr (pattern, '@')) {              if (proto_nr == KSPROTO_LDAP && strchr (pattern, '@')) {
704                  msg_box (dlg, _("Only keyids are allowed."),                  msg_box (dlg, _("Only keyids are allowed."),
705                           _("Keyserver"), MB_INFO);                           _("Keyserver"), MB_INFO);
706                  return FALSE;                  return FALSE;
707              }              }
Legend:
Removed from v.165  
changed lines
  Added in v.195
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26