/[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 181 by twoaday, Tue Mar 14 11:01:22 2006 UTC revision 190 by twoaday, Mon Mar 27 10:05:14 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"
# Line 45  Line 46 
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);      ec = kserver_sendkey (kserver, port, rawkey, strlen (rawkey));
     ec = kserver_sendkey (kserver, port, rawkey, n);  
93      if (ec) {      if (ec) {
94          hkp_err_box (dlg, kserver, port, ec);          hkp_err_box (dlg, kserver, port, ec);
95          goto leave;          goto leave;
# Line 106  hkp_send_key (HWND dlg, const char *kser Line 99  hkp_send_key (HWND dlg, const char *kser
99      status_box (dlg, msg, _("GnuPG status"));      status_box (dlg, msg, _("GnuPG status"));
100            
101  leave:  leave:
102      gpgme_release (ctx);      delete gpg;
103      if (rawkey)      free_if_alloc (rawkey);
         gpgme_free (rawkey);  
104      return ec? -1 : 0;      return ec? -1 : 0;
105  }  }
106    
# Line 150  show_imported_keys (gpgme_import_result_ Line 142  show_imported_keys (gpgme_import_result_
142    
143      for (t=res->imports; t; t = t->next) {      for (t=res->imports; t; t = t->next) {
144          if (!gpgme_get_key (ctx, t->fpr, &key, 0)) {          if (!gpgme_get_key (ctx, t->fpr, &key, 0)) {
145              s = uid = utf8_to_wincp2 (key->uids->uid);              s = uid = utf8_to_native (key->uids->uid);
146              gpgme_data_write (msg, s, strlen (s));              gpgme_data_write (msg, s, strlen (s));
147              gpgme_data_write (msg, "\n", 1);              gpgme_data_write (msg, "\n", 1);
148              gpgme_key_release (key);              gpgme_key_release (key);
# Line 305  check_pattern (const char *pattern) Line 297  check_pattern (const char *pattern)
297            
298  leave:  leave:
299      return rc;      return rc;
300  } /* check_pattern */  }
301    
302    
303  /* Return human readable name for the proxy protocol. */  /* Return human readable name for the proxy protocol. */
# Line 315  name_from_proto (int proto) Line 307  name_from_proto (int proto)
307      const char *s;      const char *s;
308    
309      switch (proto) {      switch (proto) {
310      case PROXY_PROTO_HTTP: s = "HTTP"; break;      case PROXY_PROTO_NONE:      s = ""; break;
311      case PROXY_PROTO_SOCKS5: s =  "SOCKS5"; break;      case PROXY_PROTO_HTTP:      s = "HTTP"; break;
312      default: s= "HTTP"; break;      case PROXY_PROTO_SOCKS5:    s =  "SOCKS5"; break;
313        default:                    s= "HTTP"; break;
314      }      }
315      return s;      return s;
316  }  }
317    
318    
 static void  
 set_proxy (HWND dlg)  
 {  
     char buf[384];  
   
     if (proxy.host)  
         _snprintf (buf, sizeof (buf)-1, "%s proxy: \"%s:%d\"",  
                    name_from_proto (proxy.proto), proxy.host, proxy.port);  
     else  
         strcpy (buf, _("Proxy: none"));  
     SetDlgItemText (dlg, IDC_KEYSERVER_PROXY, buf);  
 }  
   
   
319  static int inline  static int inline
320  kserver_get_pos (listview_ctrl_t lv)  kserver_get_pos (listview_ctrl_t lv)
321  {  {
# Line 356  kserver_get_port (listview_ctrl_t lv) Line 335  kserver_get_port (listview_ctrl_t lv)
335  }  }
336    
337    
 /* Load the default keyserver and mark it in @lv. */  
338  static void  static void
339  load_default_ks (listview_ctrl_t lv)  set_default_ks (listview_ctrl_t lv)
340  {  {
341      char * p, buf[192];      char *p, buf[200];
342      int i;      int i;
343    
344      p = get_reg_entry_keyserver ("Default");      p = get_reg_entry_keyserver ("Default");
345      if (!p)      if (!p)
346          return;          return;
347      for (i = 0; i < listview_count_items (lv, 0); i++) {      for (i=0; i < listview_count_items (lv, 0); i++) {
348          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);      
349          if (!strncmp (p, buf, strlen (p))) {          if (!strcmp (buf, p)) {
350              listview_add_sub_item (lv, i, KS_COL_DEFAULT, "x");              listview_select_one (lv, i);
351              break;              break;
352          }          }
353      }      }
# Line 389  save_default_ks (listview_ctrl_t lv) Line 367  save_default_ks (listview_ctrl_t lv)
367          return -1;          return -1;
368      }      }
369      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);
370      if (!strncmp (buf, "http", 4) && !strncmp (buf, "hkp", 3)) {      if (strncmp (buf, "http", 4) && strncmp (buf, "hkp", 3)) {
371          msg_box (NULL, _("Only HTTP keyserver can be used."),          msg_box (NULL, _("Only HTTP keyserver can be used."),
372                   _("Keyserver"), MB_ERR);                   _("Keyserver"), MB_ERR);
373          return -1;          return -1;
374      }      }
     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);  
375      set_reg_entry_keyserver ("Default", buf);      set_reg_entry_keyserver ("Default", buf);
376      i = kserver_get_port (lv);      i = kserver_get_port (lv);
377      sprintf (port, "%d", i);      sprintf (port, "%d", i);
# Line 411  int Line 385  int
385  keyserver_list_build (listview_ctrl_t *r_lv, HWND hwnd)  keyserver_list_build (listview_ctrl_t *r_lv, HWND hwnd)
386  {  {
387      struct listview_column_s keyserver[] = {      struct listview_column_s keyserver[] = {
388          {0, 160, (char *)_("DNS Name")},          {0, 180, (char *)_("DNS Name")},
389          {1,  46, (char *)_("Port")},          {1,  55, (char *)_("Port")},
         {2,  60, (char *)_("Default")},  
390          {0,   0, NULL}          {0,   0, NULL}
391      };      };
392      HICON ico[1];      HICON ico[1];
# Line 435  keyserver_list_build (listview_ctrl_t *r Line 408  keyserver_list_build (listview_ctrl_t *r
408          sprintf (buf, "%d", server[j].port);          sprintf (buf, "%d", server[j].port);
409          listview_add_sub_item (lv, 0, KS_COL_PORT, buf);          listview_add_sub_item (lv, 0, KS_COL_PORT, buf);
410      }      }
     load_default_ks (lv);  
411      if (listview_count_items (lv, 0) == 0) {      if (listview_count_items (lv, 0) == 0) {
412          listview_add_item (lv, "");          listview_add_item (lv, "");
413          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 546  keyserver_modify_dlg_proc (HWND dlg, UIN Line 518  keyserver_modify_dlg_proc (HWND dlg, UIN
518              EnableWindow (GetDlgItem (dlg, IDC_KSERVADD_TYPES), FALSE);              EnableWindow (GetDlgItem (dlg, IDC_KSERVADD_TYPES), FALSE);
519          }          }
520          else          else
521              SetDlgItemInt (dlg, IDC_KSERVADD_PORT, 11371, FALSE);              SetDlgItemInt (dlg, IDC_KSERVADD_PORT, 11371, FALSE);      
522          SetWindowText (dlg, _("Edit Keyserver"));          SetWindowText (dlg, _("Edit Keyserver"));
523          SetDlgItemText (dlg, IDOK, _("&Add"));          SetDlgItemText (dlg, IDOK, _("&Add"));
524          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
# Line 615  keyserver_dlg_proc (HWND dlg, UINT msg, Line 587  keyserver_dlg_proc (HWND dlg, UINT msg,
587          SetDlgItemText (dlg, IDC_KEYSERVER_INFO,          SetDlgItemText (dlg, IDC_KEYSERVER_INFO,
588                          _("Please enter the key ID or email address you search for"));                          _("Please enter the key ID or email address you search for"));
589          SetDlgItemText (dlg, IDC_KEYSERVER_INDEX, _("&Search"));          SetDlgItemText (dlg, IDC_KEYSERVER_INDEX, _("&Search"));
590          SetDlgItemText (dlg, IDC_KEYSERVER_PROXSETT, _("C&hange"));          SetDlgItemText (dlg, IDC_KEYSERVER_PROXSETT, _("C&hange proxy"));
591          SetDlgItemText (dlg, IDC_KEYSERVER_DEFAULT, _("Set &default"));          SetDlgItemText (dlg, IDC_KEYSERVER_DEFAULT, _("Set &default"));
592          SetDlgItemText (dlg, IDCANCEL, _("&Close"));          SetDlgItemText (dlg, IDCANCEL, _("&Close"));
593            
         set_proxy (dlg);  
594          keyserver_list_build (&lv, GetDlgItem (dlg, IDC_KEYSERVER_LIST));          keyserver_list_build (&lv, GetDlgItem (dlg, IDC_KEYSERVER_LIST));
595            set_default_ks (lv);
596          center_window (dlg, NULL);          center_window (dlg, NULL);
597          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
598          return TRUE;          return TRUE;
# Line 669  keyserver_dlg_proc (HWND dlg, UINT msg, Line 641  keyserver_dlg_proc (HWND dlg, UINT msg,
641              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSERVER_PROXY,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSERVER_PROXY,
642                                dlg, keyserver_proxy_dlg_proc, NULL,                                dlg, keyserver_proxy_dlg_proc, NULL,
643                                _("Proxy Settings"), IDS_WINPT_KEYSERVER_PROXY);                                _("Proxy Settings"), IDS_WINPT_KEYSERVER_PROXY);
             set_proxy (dlg);  
644              return TRUE;              return TRUE;
645                            
646          case IDC_KEYSERVER_INDEX:          case IDC_KEYSERVER_INDEX:
# Line 728  keyserver_dlg_proc (HWND dlg, UINT msg, Line 699  keyserver_dlg_proc (HWND dlg, UINT msg,
699                  return FALSE;                  return FALSE;
700              }              }
701              if (proto_nr == KSPROTO_LDAP && strchr (pattern, '@')) {              if (proto_nr == KSPROTO_LDAP && strchr (pattern, '@')) {
702                  msg_box (dlg, _("Only keyids are allowed."),                  msg_box (dlg, _("Only keyids are allowed."),
703                           _("Keyserver"), MB_INFO);                           _("Keyserver"), MB_INFO);
704                  return FALSE;                  return FALSE;
705              }              }
Legend:
Removed from v.181  
changed lines
  Added in v.190
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26