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

Diff of /trunk/Src/wptGPG.cpp

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

revision 270 by twoaday, Sat Oct 21 18:08:57 2006 UTC revision 328 by twoaday, Fri Sep 25 16:07:38 2009 UTC
# Line 1  Line 1 
1  /* wptGPG.cpp - GnuPG configuration  /* wptGPG.cpp - GnuPG configuration
2   *      Copyright (C) 2001-2006 Timo Schulz   *      Copyright (C) 2001-2009 Timo Schulz
3   *   *
4   * This file is part of WinPT.   * This file is part of WinPT.
5   *   *
# Line 12  Line 12 
12   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * but WITHOUT ANY WARRANTY; without even the implied warranty of
13   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14   * General Public License for more details.   * 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  
15   */   */
16  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
17  #include <config.h>  #include <config.h>
# Line 31  Line 27 
27    
28  #include "wptGPG.h"  #include "wptGPG.h"
29  #include "wptGpgCmds.h"  #include "wptGpgCmds.h"
 #include "wptGPGOptSkel.h"  
30  #include "wptTypes.h"  #include "wptTypes.h"
31  #include "wptNLS.h"  #include "wptNLS.h"
32  #include "wptRegistry.h"  #include "wptRegistry.h"
# Line 67  static int check_keyring (char ** r_path Line 62  static int check_keyring (char ** r_path
62  char*  char*
63  multi_gnupg_path (int strict)  multi_gnupg_path (int strict)
64  {  {
65      static char buf[256+64];      static char buf[MAX_PATH+64];
66      BOOL ec;      BOOL ec;
67    
68      /* MSDN: buf must be at least MAX_PATH=256 bytes */      /* MSDN: buf must be at least MAX_PATH=256 bytes */
# Line 106  get_gnupg_path (void) Line 101  get_gnupg_path (void)
101  char*  char*
102  get_gnupg_cfgfile (void)  get_gnupg_cfgfile (void)
103  {  {
104      char *optfile = NULL;      char *optfile;
105      char *path;      char *path;
     size_t nlen;  
106    
107      path = get_gnupg_path ();      path = get_gnupg_path ();
108      if (!path)      if (!path)
109          return NULL;          return NULL;
110      nlen = strlen (path) + 64;      optfile = make_filename (path, GPG_CONF, NULL);
     optfile = new char[nlen + 1];  
     if (!optfile)  
         BUG (NULL);  
     _snprintf (optfile, nlen, "%s\\"GPG_CONF, path);  
   
111      free_if_alloc (path);      free_if_alloc (path);
112    
113      return optfile;      return optfile;
114  }  }
115    
116    
117    static char*
118    get_keyring_from_conf (const char *fname, int pub)
119    {
120        config_file_t opt;
121        conf_option_t e;
122        char *kring = NULL;
123        int rc;
124    
125        rc = parse_config (fname, &opt);
126        if (rc)
127            return NULL;
128        if (pub)
129            e = conf_find_option (opt, "keyring");
130        else
131            e = conf_find_option (opt, "secret-keyring");
132        if (e != NULL)
133            kring = m_strdup (e->val);
134        release_config (opt);
135    
136        return kring;
137    }
138    
139    
140  /* Return the full path of the keyring. If @pub is 1, the public  /* Return the full path of the keyring. If @pub is 1, the public
141     keyring is return, otherwise the secret keyring. */     keyring is return, otherwise the secret keyring. */
142  char*  char*
143  get_gnupg_keyring (int pub, int strict)  get_gnupg_keyring (int pub, int strict)
144  {      {    
145      char *optfile = NULL;      char *optfile;
146      char *path = NULL;      char *path;
147      char *keyring = NULL;      char *keyring;
148    
149      path = get_gnupg_path ();      path = get_gnupg_path ();
150      if (!path)      if (!path)
# Line 145  get_gnupg_keyring (int pub, int strict) Line 158  get_gnupg_keyring (int pub, int strict)
158          free_if_alloc (path);          free_if_alloc (path);
159          return keyring;          return keyring;
160      }      }
161      if (file_exist_check (keyring) || pub && get_file_size (keyring) == 0) {      if (file_exist_check (keyring) ||
162            (pub && get_file_size (keyring) == 0)) {
163          free_if_alloc (keyring);          free_if_alloc (keyring);
164          optfile = make_filename (path, GPG_CONF, NULL);          optfile = make_filename (path, GPG_CONF, NULL);
165          keyring = get_gnupg_keyring_from_options (optfile, pub);          keyring = get_keyring_from_conf (optfile, pub);
166            free_if_alloc (optfile);
167      }      }
168      free_if_alloc (path);      free_if_alloc (path);
169      free_if_alloc (optfile);      
170      return keyring;      return keyring;
171  }  }
172    
# Line 211  default_key_from_cache (int *ret_no_usea Line 226  default_key_from_cache (int *ret_no_usea
226  int  int
227  gnupg_load_config (void)  gnupg_load_config (void)
228  {      {    
229      gpg_optfile_t opt;      config_file_t opt;
230      char *conf;      char *conf;
231        int rc = 0;
232            
233      conf = get_gnupg_cfgfile ();      conf = get_gnupg_cfgfile ();
234      if (!conf)      if (!conf)
# Line 221  gnupg_load_config (void) Line 237  gnupg_load_config (void)
237          free_if_alloc (conf);          free_if_alloc (conf);
238          return -1;          return -1;
239      }      }
240      if (find_option (opt, "ask-cert-level"))      free_if_alloc (conf);
241        if (conf_find_option (opt, "ask-cert-level"))
242          reg_prefs.gpg.ask_cert_level = 1;          reg_prefs.gpg.ask_cert_level = 1;
243      if (find_option (opt, "ask-cert-expire"))      if (conf_find_option (opt, "ask-cert-expire"))
244          reg_prefs.gpg.ask_cert_expire = 1;          reg_prefs.gpg.ask_cert_expire = 1;
245        /* The 'textmode' option for GPG is useful for text files
246           but it breaks the output of any binary data. Thus we return
247           a warning here to inform the user that binary output is broken. */
248        if (conf_find_option (opt, "textmode"))
249            rc = -2;
250      release_config (opt);      release_config (opt);
251      free_if_alloc (conf);  
252      return 0;      return rc;
253  }  }
254    
255    
# Line 237  extract_keyid (const char *val) Line 259  extract_keyid (const char *val)
259  {      {    
260      size_t len = strlen (val);      size_t len = strlen (val);
261    
262      if (len > 1 && val[len-1] == '!') {      if (len > 1 && val[len-1] == '!')
263          char *p = new char[len+1];          return substr (val, 0, len-1);
         if (!p)  
             BUG (0);  
         memset (p, 0, len+1);  
         memcpy (p, val, len-1);  
         return p;  
     }  
264      return m_strdup (val);      return m_strdup (val);
265  }  }
266    
267    
268    /* Return the default key.
269       This can be either a substring or a key ID. */
270  char*  char*
271  get_gnupg_default_key (void)  get_gnupg_default_key (void)
272  {      {    
273      gpg_optfile_t opt = NULL;      config_file_t opt = NULL;
274      gpg_option_t e;      conf_option_t e;
275      char *keyid = NULL, *optfile = NULL;      char *keyid = NULL, *optfile = NULL;
276      int no_usable=0;      int no_usable=0;
277    
# Line 264  get_gnupg_default_key (void) Line 282  get_gnupg_default_key (void)
282          free_if_alloc (optfile);          free_if_alloc (optfile);
283          return default_key_from_cache (&no_usable);          return default_key_from_cache (&no_usable);
284      }      }
285      e = find_option (opt, "default-key");      /* First we search for config entries which specify a default key. */
286        e = conf_find_option (opt, "default-key");
287      if (!e)      if (!e)
288          e = find_option (opt, "local-user");          e = conf_find_option (opt, "local-user");
289      if (e)      if (e)
290          keyid = extract_keyid (e->val);          keyid = extract_keyid (e->val);
291    
292      free_if_alloc (optfile);      free_if_alloc (optfile);
293      release_config (opt);      release_config (opt);
294    
295        /* If no entry in the config has been found, we get a key
296           from the key cache. */
297      if (!keyid)      if (!keyid)
298          keyid = default_key_from_cache (&no_usable);          keyid = default_key_from_cache (&no_usable);
299      return keyid;      return keyid;
# Line 310  check_gnupg_prog (void) Line 332  check_gnupg_prog (void)
332    
333  static int  static int
334  parse_version_nr (const char *buf, int *major, int *minor, int *patch)  parse_version_nr (const char *buf, int *major, int *minor, int *patch)
335  {  {  
336      char tmp[8];      char *p;
337      int i;      char *tmp = m_strdup(buf);
338            
339      i=0;      int pos=0;
340      while (buf && *buf != '.' && i < 8)      while ((p = strsep(&tmp, ".")) != NULL) {
341          tmp[i++] = *buf++;          switch (++pos) {
342      tmp[i] = 0; buf++;          case 1: *major = atoi (p); break;
343      *major = atoi (tmp);          case 2: *minor = atoi (p); break;
344      i=0;          case 3: *patch = atoi (p); break;
345      while (buf && *buf != '.' && i < 8)          }
346          tmp[i++] = *buf++;      }
347      tmp[i] = 0; buf++;      delete[] tmp;  
348      *minor = atoi (tmp);      if (pos != 3)
349      i=0;          return -1;  
     while (buf && isdigit (*buf) && i < 8)  
         tmp[i++] = *buf++;  
     tmp[i] = 0;  
     *patch = atoi (tmp);  
350      return 0;      return 0;
351  }  }
352    
# Line 340  int Line 358  int
358  check_gnupg_engine (const char *need_gpg_ver,  check_gnupg_engine (const char *need_gpg_ver,
359                      int *r_major, int *r_minor, int *r_patch)                      int *r_major, int *r_minor, int *r_patch)
360  {  {
     gpgme_ctx_t ctx;  
361      gpgme_engine_info_t inf;      gpgme_engine_info_t inf;
362      char *eng = NULL;      char *eng = NULL;
363      int major=0, minor=0, patch=0;      int major=0, minor=0, patch=0;
# Line 352  check_gnupg_engine (const char *need_gpg Line 369  check_gnupg_engine (const char *need_gpg
369                            &need_major, &need_minor, &need_patch))                            &need_major, &need_minor, &need_patch))
370          return 1;          return 1;
371            
372      gpgme_new (&ctx);      if (gpgme_get_engine_info (&inf))
373      inf = gpgme_ctx_get_engine_info (ctx);       return -1;
     if (!inf) {  
         gpgme_release (ctx);  
         return -1;  
     }  
374    
375      /* We need to exec GPG again to find out if IDEA is available. */      /* We need to exec GPG again to find out if IDEA is available. */
376      if (gpg_get_version (&eng)) {      if (gpg_get_version (&eng))
377          gpgme_release (ctx);       return -1;
         return -1;  
     }  
378      if (strstr (eng, "IDEA"))      if (strstr (eng, "IDEA"))
379          idea_available = 1;          idea_available = 1;
380      safe_free (eng);      safe_free (eng);
381      if (parse_version_nr (inf->version, &major, &minor, &patch)) {    
382          gpgme_release (ctx);      if (parse_version_nr (inf->version, &major, &minor, &patch))
383          return 1;          return 1;
     }  
     gpgme_release (ctx);  
384    
385      if (major > need_major)      if (major > need_major)
386          rc = 0;          rc = 0;
# Line 394  check_gnupg_engine (const char *need_gpg Line 403  check_gnupg_engine (const char *need_gpg
403  static int  static int
404  cfgfile_count_keyrings (const char *fname, int *r_secrings, int *r_pubrings)  cfgfile_count_keyrings (const char *fname, int *r_secrings, int *r_pubrings)
405  {  {
406      gpg_optfile_t opt;          config_file_t opt;    
407      gpg_option_t e;      conf_option_t e;
408    
409      *r_secrings = 0;      *r_secrings = 0;
410      *r_pubrings = 0;      *r_pubrings = 0;
# Line 483  gnupg_access_files (void) Line 492  gnupg_access_files (void)
492  }  }
493    
494    
 static int  
 create_gpg_conf (void)  
 {  
     FILE *fp;  
     char *s, *optfile;  
   
     s = get_gnupg_path ();  
     if (!s)  
         return WPTERR_FILE_CREAT;  
     optfile = make_filename (s, GPG_CONF, NULL);  
     fp = fopen (optfile, "wb");  
     if (!fp) {  
         return WPTERR_FILE_CREAT;  
         goto fail;  
     }  
     fwrite (options_skel, 1, strlen (options_skel), fp);  
     fclose (fp);  
   
 fail:  
     free_if_alloc (s);  
     free_if_alloc (optfile);  
     return 0;  
 }  
   
495    
496  /* Return the contents of the options file as a char buf. */  /* Return the contents of the options file as a char buf. */
497  char*  char*
498  get_gnupg_config (void)  get_gnupg_config (void)
499  {  {
500      FILE *fp;      FILE *fp;
501      char *p = NULL, *optfile = NULL;      char *p = NULL, *optfile;
502      int fsize;      int fsize;
503                    
504      optfile = get_gnupg_cfgfile ();      optfile = get_gnupg_cfgfile ();
505      if (!optfile)      if (!optfile)
506          return NULL;          return NULL;
507      fsize = get_file_size (optfile);      fsize = get_file_size (optfile);
508      if (!fsize) {      if (fsize < 1 || fsize > 100000)
509          if (create_gpg_conf ())          goto leave; /* too large or does not exist */
510              return NULL;      
511          fsize = get_file_size (optfile);      fp = fopen (optfile, "rb");
512      }      if (!fp)
513      if (fsize > 100000)          goto leave;
         goto leave; /* too large */  
514      p = new char[fsize+1];      p = new char[fsize+1];
515      if (!p)      if (!p)
516          BUG (NULL);          BUG (NULL);
     fp = fopen( optfile, "rb" );  
     if (!fp) {  
         free_if_alloc (p);  
         return NULL;  
     }  
517      fread (p, 1, fsize, fp);      fread (p, 1, fsize, fp);
518      fclose (fp);      fclose (fp);
519      p[fsize] = '\0';      p[fsize] = '\0';
520      free_if_alloc (optfile);      
   
521  leave:  leave:
522        free_if_alloc (optfile);
523      return p;      return p;
524  }  }
525    
# Line 550  leave: Line 529  leave:
529  int  int
530  set_gnupg_default_key (const char *key)  set_gnupg_default_key (const char *key)
531  {  {
532      gpg_optfile_t opt;      config_file_t opt;
533      gpg_option_t e;      conf_option_t e;
534      char *optfile = NULL;      char *optfile = NULL;
535      int rc = 0;      int rc = 0;
536    
# Line 563  set_gnupg_default_key (const char *key) Line 542  set_gnupg_default_key (const char *key)
542          free_if_alloc (optfile);          free_if_alloc (optfile);
543          return WPTERR_GENERAL;          return WPTERR_GENERAL;
544      }      }
545      e = find_option (opt, "default-key");      e = conf_find_option (opt, "default-key");
546      if (e && !key)      if (e && !key)
547          e->used = 0;          e->used = 0;
548      else if (e) {      else if (e) {
# Line 572  set_gnupg_default_key (const char *key) Line 551  set_gnupg_default_key (const char *key)
551          e->used = 1;          e->used = 1;
552      }      }
553      else if (key)      else if (key)
554          add_entry (opt, ENTRY_MULTI, "default-key", key);          conf_add_entry (opt, ENTRY_MULTI, "default-key", key);
555      rc = commit_config (optfile, opt);      rc = commit_config (optfile, opt);
556    
557      free_if_alloc (optfile);      free_if_alloc (optfile);
# Line 626  static int Line 605  static int
605  check_line (const char *buf)  check_line (const char *buf)
606  {  {
607      int j, len;      int j, len;
608      int rc;      int rc = 0;
609    
610      if (*buf == '#' || *buf == '\r' || *buf == '\n')      if (*buf == '#' || *buf == '\r' || *buf == '\n')
611          return 1;          return 1;
     rc = 0;  
612      for (j = 0; valid_gpg_args[j]; j++) {      for (j = 0; valid_gpg_args[j]; j++) {
613          len = strlen (valid_gpg_args[j]);          len = strlen (valid_gpg_args[j]);
614          if (!strncmp (valid_gpg_args[j], buf, len))          if (!strncmp (valid_gpg_args[j], buf, len))
# Line 647  check_gnupg_options (const char *buf, in Line 625  check_gnupg_options (const char *buf, in
625      int nbytes = 0, lineno=0;      int nbytes = 0, lineno=0;
626      unsigned j;      unsigned j;
627                    
628      for  (j = 0; j < strlen (buf) && j < sizeof (line); j++) {      for  (j = 0; j < strlen (buf) && j < DIM (line); j++) {
629          line[nbytes++] = buf[j];          line[nbytes++] = buf[j];
630          if (buf[j] == '\n' || j == (strlen (buf) - 1)) {          if (buf[j] == '\n' || j == (strlen (buf) - 1)) {
631              line[nbytes] = '\0';              line[nbytes] = '\0';
# Line 675  get_last_gnupg_access (gpg_monitor_t ctx Line 653  get_last_gnupg_access (gpg_monitor_t ctx
653      HANDLE fd;      HANDLE fd;
654    
655      fd = CreateFile (ctx->fpath_object, GENERIC_READ, FILE_SHARE_READ,      fd = CreateFile (ctx->fpath_object, GENERIC_READ, FILE_SHARE_READ,
656                       NULL, OPEN_ALWAYS, 0, NULL);                       NULL, OPEN_EXISTING, 0, NULL);
657      if (fd == INVALID_HANDLE_VALUE)      if (fd == INVALID_HANDLE_VALUE)
658          return WPTERR_FILE_OPEN;          return WPTERR_FILE_OPEN;
659      GetFileTime (fd, NULL, NULL, &ctx->access);      GetFileTime (fd, NULL, NULL, &ctx->access);
# Line 725  init_gnupg_table (void) Line 703  init_gnupg_table (void)
703  void  void
704  free_gnupg_table (void)  free_gnupg_table (void)
705  {  {
706      int j;      for (int j=0; j < gpg_table_count; j++) {
   
     for (j=0; j < gpg_table_count; j++) {  
707          free_if_alloc (gpg_table[j].object);          free_if_alloc (gpg_table[j].object);
708          free_if_alloc (gpg_table[j].fpath_object);          free_if_alloc (gpg_table[j].fpath_object);
709      }      }
# Line 739  int Line 715  int
715  keyring_check_last_access (void)  keyring_check_last_access (void)
716  {  {
717      int nfiles;      int nfiles;
     int pos;  
718    
719      nfiles = 0;      nfiles = 0;
720      for (pos = 0; pos < gpg_table_count; pos++) {      for (int pos = 0; pos < gpg_table_count; pos++) {
721          get_last_gnupg_access (&gpg_table[pos]);          get_last_gnupg_access (&gpg_table[pos]);
722          check_last_gnupg_access (&gpg_table[pos]);          check_last_gnupg_access (&gpg_table[pos]);
723          if (gpg_table[pos].modified)          if (gpg_table[pos].modified)
# Line 782  gnupg_check_file_ext (const char *fname, Line 757  gnupg_check_file_ext (const char *fname,
757  }  }
758    
759    
760  char*  /* Check if the device where file @fname is stored on, is write-protected. */
 get_gnupg_keyring_from_options (const char *fname, int pub)  
 {  
     gpg_optfile_t opt;  
     gpg_option_t e;  
     char *kring = NULL;  
     int rc;  
   
     rc = parse_config (fname, &opt);  
     if (rc)  
         return NULL;  
     if (pub)  
         e = find_option (opt, "keyring");  
     else  
         e = find_option (opt, "secret-keyring");  
     if (e)  
         kring = m_strdup (e->val);  
     release_config (opt);  
   
     return kring;  
 }  
   
   
 /* Check if the device file @fname is stored on, is write-protected. */  
761  static int  static int
762  my_access (const char *fname)  check_file_access (const char *fname, int mode)
763  {  {
764      HANDLE hd;      HANDLE hd;
765    
766      hd = CreateFile (fname, GENERIC_WRITE, FILE_SHARE_WRITE,      if (!mode)
767            mode = FILE_SHARE_WRITE;
768        hd = CreateFile (fname, GENERIC_WRITE, mode,
769                       NULL, OPEN_EXISTING, 0, NULL);                       NULL, OPEN_EXISTING, 0, NULL);
770      if (hd == INVALID_HANDLE_VALUE)      if (hd == INVALID_HANDLE_VALUE)
771          return -1;          return -1;
# Line 819  my_access (const char *fname) Line 773  my_access (const char *fname)
773      return 0;      return 0;
774  }  }
775    
776        
777    /* Check the device where the file @fname is stored on, is either
778       write-protected or if the file is already opened by another process
779       exclusively. And as a result, we cannot use the file for output. */
780    int
781    gpg_check_file_permissions (const char *fname, int mode)
782    {
783        int api_mode;
784        
785        switch (mode) {
786        case 0: api_mode = FILE_SHARE_READ; break;
787        case 1: api_mode = FILE_SHARE_WRITE; break;
788        case 2: api_mode = FILE_SHARE_WRITE|FILE_SHARE_READ; break;
789        default: api_mode = FILE_SHARE_READ; break;
790        }
791    
792        return check_file_access (fname, api_mode);
793    }
794    
795    
796  /* Check the file permissions of the public keyring.  /* Check the file permissions of the public keyring.
797     If @showmsg is 1 output a message in case of errors.     If @showmsg is 1 output a message in case of errors.
# Line 853  gpg_check_permissions (int showmsg) Line 826  gpg_check_permissions (int showmsg)
826                  failed = 1;                  failed = 1;
827              }              }
828          }          }
829          if (my_access (name)) {          if (gpg_check_file_permissions (name, 1)) {
830              if (showmsg)              if (showmsg)
831                  msg_box (NULL,                  msg_box (NULL,
832                  _("You do not have file access to modify the contents of\n"                  _("You do not have file access to modify the contents of\n"
# Line 905  int Line 878  int
878  gnupg_copy_keyrings (void)  gnupg_copy_keyrings (void)
879  {  {
880      const char *pring, *sring;      const char *pring, *sring;
881      char *file = NULL, *path = NULL;      char *file = NULL, *path;
882      int id = 0, rc = 0;      int id, rc = 0;
883      HWND hwnd;      HWND hwnd;
884            
885      path = get_gnupg_path ();      path = get_gnupg_path ();
# Line 915  gnupg_copy_keyrings (void) Line 888  gnupg_copy_keyrings (void)
888      hwnd = GetDesktopWindow ();      hwnd = GetDesktopWindow ();
889    
890      pring = get_fileopen_dlg (hwnd, _("Please choose your Public Keyring"),      pring = get_fileopen_dlg (hwnd, _("Please choose your Public Keyring"),
891                                "GPG Keyrings (*.gpg)\0*.gpg\0\0",NULL);                                "GPG Keyrings (*.gpg)\0*.gpg\0\0", NULL);
892      if (!pring) {      if (!pring) {
893          msg_box (hwnd, _("No keyring was chosen. Exit."),          msg_box (hwnd, _("No keyring was chosen. Exit."),
894                   _("WinPT Error"), MB_ERR);                   _("WinPT Error"), MB_ERR);
895          free_if_alloc (path);          free_if_alloc (path);
896          return WPTERR_GENERAL;          return WPTERR_GENERAL;
897      }      }
898      file = make_filename (path, "pubring", "gpg");      file = make_filename (path, "pubring", "gpg");
899      if (file_exist_check (file) == 0) {      if (file_exist_check (file) == 0) {
900          id = msg_box (hwnd, _("Overwrite old public keyring?"),          id = msg_box (hwnd, _("Overwrite old public keyring?"),
901                        "WinPT", MB_INFO|MB_YESNO);                        "WinPT", MB_INFO|MB_YESNO);
902          if (id == IDNO)          if (id == IDNO)
903              goto fail;              goto fail;
904      }      }
905      if (!CopyFile (pring, file, FALSE)) {      if (!CopyFile (pring, file, FALSE)) {
906          msg_box (hwnd, _("Could not copy file."), _("WinPT Error"), MB_ERR);          msg_box (hwnd, _("Could not copy public keyring."),
907                     _("WinPT Error"), MB_ERR);
908          rc = WPTERR_FILE_READ;          rc = WPTERR_FILE_READ;
909          goto fail;          goto fail;
910      }      }
# Line 951  gnupg_copy_keyrings (void) Line 925  gnupg_copy_keyrings (void)
925              goto fail;              goto fail;
926      }      }
927      if (!CopyFile (sring, file, FALSE)) {      if (!CopyFile (sring, file, FALSE)) {
928          msg_box (NULL, _("Could not copy file."), _("WinPT Error"), MB_ERR);          msg_box (NULL, _("Could not copy secret keyring."), _("WinPT Error"), MB_ERR);
929          rc = WPTERR_FILE_READ;          rc = WPTERR_FILE_READ;
930      }      }
931    
# Line 1016  check_keyring (char **r_path) Line 990  check_keyring (char **r_path)
990      opt = get_gnupg_cfgfile ();      opt = get_gnupg_cfgfile ();
991      if (!opt)      if (!opt)
992          BUG (0);          BUG (0);
993      name = get_gnupg_keyring_from_options (opt, 1);      name = get_keyring_from_conf (opt, 1);
994      free_if_alloc (opt);      free_if_alloc (opt);
995      free_if_alloc (p);      free_if_alloc (p);
996      if (!name)      if (!name)
# Line 1040  static char* Line 1014  static char*
1014  get_backup_name (const char *templ)  get_backup_name (const char *templ)
1015  {  {
1016      struct tm *tm;      struct tm *tm;
1017        const char *fmt;
1018      char *p;      char *p;
1019      time_t t;      time_t t;
1020    
1021      t = time (NULL);      t = time (NULL);
1022      tm = localtime (&t);      tm = localtime (&t);
1023      p = new char [strlen (templ) + 8 + 1];      fmt = "%s-%d";
1024        p = new char [strlen (templ) + strlen (fmt) + 8 + 1];
1025      if (!p)      if (!p)
1026          BUG (0);          BUG (0);
1027      sprintf (p, "%s-%d", templ, tm->tm_wday % 3);      sprintf (p, fmt, templ, tm->tm_wday % 3);
1028      return p;      return p;
1029  }  }
1030    
# Line 1060  get_backup_name (const char *templ) Line 1036  get_backup_name (const char *templ)
1036  void  void
1037  gnupg_backup_keyrings (int auto_backup, int backup_mode, int include_secr)  gnupg_backup_keyrings (int auto_backup, int backup_mode, int include_secr)
1038  {  {
1039      char *srcpath = NULL, *dstpath = NULL;      char *srcpath, *dstpath;
1040      char *name=NULL;      char *name;
1041      int rc;      int rc;
1042    
1043      if (!auto_backup)      if (!auto_backup)
# Line 1069  gnupg_backup_keyrings (int auto_backup, Line 1045  gnupg_backup_keyrings (int auto_backup,
1045      srcpath = get_gnupg_path ();      srcpath = get_gnupg_path ();
1046      check_keyring (&srcpath);      check_keyring (&srcpath);
1047      if (backup_mode == 1) {      if (backup_mode == 1) {
1048          dstpath = multi_gnupg_path (1);          /* If the backup mode uses the home directory the source
1049               and destination folder will be the same. */
1050            dstpath = get_gnupg_path ();
1051          check_keyring (&dstpath);          check_keyring (&dstpath);
1052      }      }
1053      else if (backup_mode == 2) {      else if (backup_mode == 2) {
# Line 1089  gnupg_backup_keyrings (int auto_backup, Line 1067  gnupg_backup_keyrings (int auto_backup,
1067              DeleteFile (tmpfile);              DeleteFile (tmpfile);
1068          }          }
1069          free_if_alloc (tmpfile);          free_if_alloc (tmpfile);
1070          if (!fp || rc == IDCANCEL)          if (!fp || rc == IDCANCEL) {
1071                free_if_alloc (dstpath);
1072                free_if_alloc (srcpath);
1073              return;              return;
1074            }
1075      }      }
1076      else {      else {
1077          log_box (_("Backup"), MB_ERR, _("Invalid backup mode %d"), backup_mode);          log_box (_("Backup"), MB_ERR, _("Invalid backup mode %d"), backup_mode);
1078            free_if_alloc (srcpath);
1079          return;          return;
1080      }      }
1081      name = get_backup_name ("pubring-bak");      name = get_backup_name ("pubring-bak");
Legend:
Removed from v.270  
changed lines
  Added in v.328
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26