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

Diff of /trunk/Src/WinPT.cpp

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

revision 48 by werner, Mon Oct 31 21:14:11 2005 UTC revision 73 by twoaday, Tue Nov 8 07:15:13 2005 UTC
# Line 42  Line 42 
42    
43  #define MIN_GPG_VER   "1.4.3"   /* Minimal GPG version. */  #define MIN_GPG_VER   "1.4.3"   /* Minimal GPG version. */
44  #define MIN_GPGME_VER "1.2.0"   /* Minimal GPGME version. */  #define MIN_GPGME_VER "1.2.0"   /* Minimal GPGME version. */
 #define MIN_PTD_VER   "0.8.1"   /* Minimal PTD version. */  
45    
46    
47  HINSTANCE glob_hinst;   /* global instance for the dialogs */  HINSTANCE glob_hinst;   /* global instance for the dialogs */
# Line 127  check_default_key (gpg_keycache_t kc) Line 126  check_default_key (gpg_keycache_t kc)
126      defkey = get_gnupg_default_key ();      defkey = get_gnupg_default_key ();
127      if (defkey)      if (defkey)
128          err = gpg_keycache_find_key (kc, defkey, 0, &key);          err = gpg_keycache_find_key (kc, defkey, 0, &key);
129        else
130            msg_box (NULL, _("No useable secret key found."), _("WinPT Error"), MB_ERR);
131      free_if_alloc (defkey);      free_if_alloc (defkey);
132      return err? -1 : 0;      return err? -1 : 0;
133  }  }
# Line 187  check_crypto_engine (void) Line 188  check_crypto_engine (void)
188          return rc;          return rc;
189      }      }
190      /* We enable smartcard support for GPG: 1.9 or >= 1.4 */      /* We enable smartcard support for GPG: 1.9 or >= 1.4 */
191      if (ma >= 1 && mi >= 4)      if ((ma == 1 && mi >= 4) || ma > 1)
192          scard_support = 1;          scard_support = 1;
193    
194      gpgver[0] = ma;      gpgver[0] = ma;
# Line 254  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 255  WinMain (HINSTANCE hinst, HINSTANCE hpre
255    
256      glob_hinst = hinst;      glob_hinst = hinst;
257    
258      #ifdef _DEBUG  #ifdef _DEBUG
259      gpg_set_debug_mode (1);      gpg_set_debug_mode (1);
260      debug = 1;      debug = 1;
261      #endif  #endif
   
     s = PTD_get_version ();  
     if (strcmp (s, MIN_PTD_VER)) {  
         log_box (_("Privacy Tray Dynamic (PTD)"), MB_ERR,  
                  _("Please update your PTD.dll to the newest version, "  
                    "the version (%s) you use is too old."), s);  
         return 0;  
     }  
262    
263      if (gpg_md_selftest ()) {      if (gpg_md_selftest ()) {
264          msg_box (NULL, _("Cryptographic selftest failed."),          msg_box (NULL, _("Cryptographic selftest failed."),
# Line 397  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 390  WinMain (HINSTANCE hinst, HINSTANCE hpre
390    
391      if (cmdline && stristr (cmdline, "--wipe-freespace")) {      if (cmdline && stristr (cmdline, "--wipe-freespace")) {
392          dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_SPACE_SECDEL,          dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_SPACE_SECDEL,
393                              GetDesktopWindow(), space_wipefrees_dlg_proc, NULL,                              GetDesktopWindow(), space_wipefrees_dlg_proc, 0,
394                              _("Wipe Free Space"), IDS_WINPT_SPACE_SECDEL);                              _("Wipe Free Space"), IDS_WINPT_SPACE_SECDEL);
395          free_gnupg_table ();          free_gnupg_table ();
396          return 0;          return 0;
# Line 410  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 403  WinMain (HINSTANCE hinst, HINSTANCE hpre
403          update_keycache (GetDesktopWindow ());          update_keycache (GetDesktopWindow ());
404          if (stristr (cmdline, "keymanager"))          if (stristr (cmdline, "keymanager"))
405              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYMISC,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYMISC,
406                              GetDesktopWindow(), keymanager_dlg_proc, NULL,                              GetDesktopWindow(), keymanager_dlg_proc, 0,
407                              _("Key Manager"), IDS_WINPT_KEYMISC);                                _("Key Manager"), IDS_WINPT_KEYMISC);  
408          else {          else {
409              gpg_card_t crd = gpg_card_load ();              gpg_card_t crd = gpg_card_load ();
Legend:
Removed from v.48  
changed lines
  Added in v.73
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26