diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2014-04-18 01:04:44 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2014-04-18 01:04:44 -0600 |
| commit | fdef7c51110e5ba139c53e3faa72f038e95d02e7 (patch) | |
| tree | b11f7982b1ac4fed50ae2a16cfc7851cd960ad59 /alpine/imap.c | |
| parent | caa4e3ccd7c9bf9352434b0f78c7b650338cd4d0 (diff) | |
| download | alpine-fdef7c51110e5ba139c53e3faa72f038e95d02e7.tar.xz | |
* Set default ssl configuration for Homebrew in MAC OSX to
/usr/local/etc/openssl, under the advice of Sam Hathaway.
* Add management certificate support for containers.
* Fix crashing bugs introduced in version 2.19.9, which did not allow
alpine to start with the -passfile and use a remote pinerc. Reported by
Ulf-Dietrich Braumann.
* fix a bug which was introduced in version 2.19.9, where Alpine would
free a certificate associated to a key after encryption, and so this
could not be used during decryption. We use X509_dup to copy the cert
and so make the copy be freed, and not the original.
* S/MIME: sign messages using intermediate certificates when needed and
possible.
Diffstat (limited to 'alpine/imap.c')
| -rw-r--r-- | alpine/imap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/alpine/imap.c b/alpine/imap.c index 04da3065..6db0a0bc 100644 --- a/alpine/imap.c +++ b/alpine/imap.c @@ -2375,12 +2375,12 @@ read_passfile(pinerc, l) #ifdef SMIME smime_init(); if(ps_global->smime->pwdcert == NULL) - setup_pwdcert(); + setup_pwdcert(&ps_global->smime->pwdcert); tmp2[0] = '\0'; fgets(tmp2, sizeof(tmp2), fp); fclose(fp); if(strcmp(tmp2, "-----BEGIN PKCS7-----\n")){ - if(encrypt_file(tmp, NULL, ps_global->smime->pwdcert)) + if(encrypt_file((char *)tmp, NULL, (PERSONAL_CERT *)ps_global->smime->pwdcert)) encrypted++; } else @@ -2399,7 +2399,7 @@ read_passfile(pinerc, l) * unencrypted and rewritten again. */ if(encrypted){ - text = text2 = decrypt_file(tmp, &i, ps_global->smime->pwdcert); + text = text2 = decrypt_file((char *)tmp, &i, (PERSONAL_CERT *)ps_global->smime->pwdcert); switch(i){ case 1 : save_password = 1; break; @@ -2631,7 +2631,7 @@ write_passfile(pinerc, l) fclose(fp); #ifdef SMIME - if(encrypt_file(tmp2, text, ps_global->smime->pwdcert) == 0){ + if(encrypt_file((char *)tmp2, text, (PERSONAL_CERT *) ps_global->smime->pwdcert) == 0){ if((fp = our_fopen(tmp2, "wb")) != NULL){ fputs(text, fp); fclose(fp); |