diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2013-10-06 23:58:51 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2013-10-06 23:58:51 -0600 |
| commit | 30a979ab1460a57d466a6a5cc6adb96eac452ce4 (patch) | |
| tree | 1aec0ebb21be40922bc5a708c7780fb0db602202 /imap/src/c-client/pop3.c | |
| parent | c5bb25b1320af6cda4cc62ea9e15fbb03ee92026 (diff) | |
| download | alpine-30a979ab1460a57d466a6a5cc6adb96eac452ce4.tar.xz | |
* new version 2.11.8
* Fix in configure script for recognition of SSL files in Ubuntu 12.04
* Alpine does not attempt to automatically reopen a collection that
was not opened due to cancellation by the user. Instead, the user
must try to open it explicitly.
* few improvements on new /tls1, /tls1_1, etc. options.
Diffstat (limited to 'imap/src/c-client/pop3.c')
| -rw-r--r-- | imap/src/c-client/pop3.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/imap/src/c-client/pop3.c b/imap/src/c-client/pop3.c index 5065fed2..123abd9d 100644 --- a/imap/src/c-client/pop3.c +++ b/imap/src/c-client/pop3.c @@ -423,6 +423,10 @@ MAILSTREAM *pop3_open (MAILSTREAM *stream) net_port (LOCAL->netstream)); if (mb.tlsflag) strcat (tmp,"/tls"); if (mb.tlssslv23) strcat (tmp,"/tls-sslv23"); + if (mb.tls1) strcat (tmp,"/tls1"); + if (mb.tls1_1) strcat (tmp,"/tls1_1"); + if (mb.tls1_2) strcat (tmp,"/tls1_1"); + if (mb.dtls1) strcat (tmp,"/dtls1"); if (mb.notlsflag) strcat (tmp,"/notls"); if (mb.sslflag) strcat (tmp,"/ssl"); if (mb.novalidate) strcat (tmp,"/novalidate-cert"); @@ -567,7 +571,7 @@ long pop3_auth (MAILSTREAM *stream,NETMBX *mb,char *pwd,char *usr) LOCAL->netstream->dtb = ssld; if (!(LOCAL->netstream->stream = (*stls) (LOCAL->netstream->stream,mb->host, - SSL_METHOD(*mb) | (mb->novalidate ? NET_NOVALIDATECERT : NIL)))) { + SSL_MTHD(*mb) | (mb->novalidate ? NET_NOVALIDATECERT : NIL)))) { /* drat, drop this connection */ if (LOCAL->netstream) net_close (LOCAL->netstream); LOCAL->netstream= NIL; |