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/mail.h | |
| 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/mail.h')
| -rw-r--r-- | imap/src/c-client/mail.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/imap/src/c-client/mail.h b/imap/src/c-client/mail.h index 2c3f92d2..ad63fa2d 100644 --- a/imap/src/c-client/mail.h +++ b/imap/src/c-client/mail.h @@ -662,10 +662,10 @@ typedef struct net_mailbox { unsigned int dbgflag : 1; /* debug flag */ unsigned int secflag : 1; /* secure flag */ unsigned int sslflag : 1; /* SSL driver flag */ - unsigned int tls1flag : 1; /* Use TLSv1 */ - unsigned int tls1_1flag : 1; /* Use TLSv1.1 */ - unsigned int tls1_2flag : 1; /* Use TLSV1.2 */ - unsigned int dtls1flag : 1; /* Use DTLSv1 */ + unsigned int tls1 : 1; /* Use TLSv1 */ + unsigned int tls1_1 : 1; /* Use TLSv1.1 */ + unsigned int tls1_2 : 1; /* Use TLSV1.2 */ + unsigned int dtls1 : 1; /* Use DTLSv1 */ unsigned int trysslflag : 1; /* try SSL driver first flag */ unsigned int novalidate : 1; /* don't validate certificates */ unsigned int tlsflag : 1; /* TLS flag */ @@ -676,11 +676,11 @@ typedef struct net_mailbox { unsigned int tlssslv23 : 1; /* force SSLv23 client method over TLS */ } NETMBX; -#define SSL_METHOD(M) ((M).tlssslv23 ? NIL \ - : (M).tls1flag ? NET_TRYTLS1 \ - : (M).tls1_1flag ? NET_TRYTLS1_1 \ - : (M).tls1_2flag ? NET_TRYTLS1_2 \ - : (M).dtls1flag ? NET_TRYDTLS1 \ +#define SSL_MTHD(M) ((M).tlssslv23 ? NIL \ + : (M).tls1 ? NET_TRYTLS1 \ + : (M).tls1_1 ? NET_TRYTLS1_1 \ + : (M).tls1_2 ? NET_TRYTLS1_2 \ + : (M).dtls1 ? NET_TRYDTLS1 \ : NET_TLSCLIENT) |