summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2018-01-21 16:52:48 -0700
committerEduardo Chappa <chappa@washington.edu>2018-01-21 16:52:48 -0700
commitfc082d271bd30310ce6928ed4341e11c36ba8ddb (patch)
tree79f6028bdb6774d149496fc5558457a4f10004cf
parent3addcb6e705b320dcaf8c6d974039719e40daa24 (diff)
downloadalpine-fc082d271bd30310ce6928ed4341e11c36ba8ddb.tar.xz
* If the directory where Alpine saves the certificates if empty,
alpine would not create a self-signed certificate to encrypt the password file. Reported in comp.mail.pine by mechanic.
-rw-r--r--alpine/imap.c2
-rw-r--r--pith/pine.hlp6
2 files changed, 6 insertions, 2 deletions
diff --git a/alpine/imap.c b/alpine/imap.c
index 495743e3..c5a79130 100644
--- a/alpine/imap.c
+++ b/alpine/imap.c
@@ -2636,7 +2636,7 @@ write_passfile(pinerc, l)
if(ps_global->pwdcert == NULL){
q_status_message(SM_ORDER, 3, 3, "Attempting to encrypt password file");
i = setup_pwdcert(&ps_global->pwdcert);
- if(i == 0 && ps_global->pwdcert == NULL)
+ if((i == 0 || i == -5) && ps_global->pwdcert == NULL)
ps_global->pwdcert = (void *) ALPINE_self_signed_certificate(NULL, 0, ps_global->pwdcertdir, MASTERNAME);
}
if(ps_global->pwdcert == NULL){ /* we tried but failed */
diff --git a/pith/pine.hlp b/pith/pine.hlp
index dee1dfd9..b8aae319 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 244 2018-01-14 12:46:05
+Alpine Commit 245 2018-01-21 16:52:38
============= h_news =================
<HTML>
<HEAD>
@@ -232,6 +232,10 @@ Bugs that have been addressed include:
<LI> TLS 1.2 works does not work if Alpine is compiled with openssl &gt;= 1.1.0.
Reported and patched by Kyle George.
+
+ <LI> If the directory where Alpine saves the certificates if empty,
+ alpine would not create a self-signed certificate to encrypt the
+ password file.
</UL>
<P>