diff options
author | Eduardo Chappa <chappa@washington.edu> | 2014-04-25 17:31:25 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2014-04-25 17:31:25 -0600 |
commit | e797af007ccac26651f003bcead095f79994d5a0 (patch) | |
tree | b291d66106dcbfba990b6a8f4f9d0986fb76abe1 /pith/conf.c | |
parent | 06525250787f8f774afa7f25901a8a805f2a29db (diff) | |
download | alpine-e797af007ccac26651f003bcead095f79994d5a0.tar.xz |
* When downloading a signed message, and processing it, we use
body->nested.part instead of b->nested.part in the
do_detached_signature_verify function, and save its body and mime
headers in create_local_cache. Now all signed messages should
verify correctly.
* Protect against potential crash bug in write_passfile function by
checking if text != NULL. text can only be null if there are no
passwords to save. We assume we could get write_passfile called
with null arguments, so this is just to protect that.
* Add handling of corner cases to several functions by initializing some
variables. Reported and patched by James Jerkins.
* When selecting the certificate/key pair to encrypt/decrypt the password
file choose it in this order:
- if -pwdcertdir is given look for certificates there, if nothing
there, we bail out;
- otherwise we look in the default directory, if anything there
and it matches to be a key/cert pair, we use it;
- otherwise we check if smime_init() has been called. If not
we call it;
- we check if a key/cert pair has been found with smime initialized,
if so, use it and copy it to the default directory;
- if not, check if there is anything in the default smime directories
(.alpine-smime/private and .alpine-smime/public), and in this
case copy it to the default.
- otherwise we bail. We will eventually create a certificate/key
pair for the user;
- finally, if we called smime_init(), we call smime_deinit().
Throughout this process, if smime_init() was not called before
we tried to get the cert/key pair we exit this process without
ps_global->smime->inited set, so that other process that need
to call smime_init() get the right structure initialized. This is
done because we might pick a cert/key pair to decrypt the password
file.
Diffstat (limited to 'pith/conf.c')
-rw-r--r-- | pith/conf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pith/conf.c b/pith/conf.c index 1b216d3a..4bc9481b 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -5935,11 +5935,11 @@ write_pinerc(struct pine *ps, EditWhich which, int flags) if(basep == NULL){ *basep = '\0'; slpath = (char *) fs_get((strlen(filename) + strlen(slink) + 2)*sizeof(char)); - sprintf(slpath, "%s/%s", filename, slink); + snprintf(slpath, sizeof(slpath), "%s/%s", filename, slink); *basep = '/'; } else { slpath = (char *) fs_get((strlen(ps_global->home_dir) + strlen(slink) + 2)*sizeof(char)); - sprintf(slpath, "%s/%s", ps_global->home_dir, slink); + snprintf(slpath, sizeof(slpath), "%s/%s", ps_global->home_dir, slink); } } file_attrib_copy(tmp, slpath); @@ -5964,6 +5964,7 @@ write_pinerc(struct pine *ps, EditWhich which, int flags) char datebuf[200]; datebuf[0] = '\0'; + we_cancel = 0; if(!(flags & WRP_NOUSER)) we_cancel = busy_cue(_("Copying to remote config"), NULL, 1); |