diff options
| author | Seonah Moon <seonah1.moon@samsung.com> | 2016-04-07 13:35:45 +0900 |
|---|---|---|
| committer | Seonah Moon <seonah1.moon@samsung.com> | 2016-04-07 13:43:56 +0900 |
| commit | 2bc9d6bb53df44a0c5174767de734620c2cdfd9e (patch) | |
| tree | 5f133be6bde9bc9fc0052463887018d5a4a61686 /lib/pop3.h | |
| parent | 727561ff7338bff27c3cae5c5f3cbf9c1a3b56e1 (diff) | |
| parent | 8a08705db260779441360e959b97b6c172f8acb0 (diff) | |
| download | curl-2bc9d6bb53df44a0c5174767de734620c2cdfd9e.tar.gz curl-2bc9d6bb53df44a0c5174767de734620c2cdfd9e.tar.bz2 curl-2bc9d6bb53df44a0c5174767de734620c2cdfd9e.zip | |
Update to 7.44.0submit/tizen/20160407.062150
Change-Id: I5b1e06765d1fe3c75597ff7db9831228ea0cad05
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
Diffstat (limited to 'lib/pop3.h')
| -rw-r--r-- | lib/pop3.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/lib/pop3.h b/lib/pop3.h index 729a55ad5..7bc53aaf5 100644 --- a/lib/pop3.h +++ b/lib/pop3.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2009 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2009 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,6 +23,7 @@ ***************************************************************************/ #include "pingpong.h" +#include "curl_sasl.h" /**************************************************************************** * POP3 unique setup @@ -35,20 +36,7 @@ typedef enum { POP3_STARTTLS, POP3_UPGRADETLS, /* asynchronously upgrade the connection to SSL/TLS (multi mode only) */ - POP3_AUTH_PLAIN, - POP3_AUTH_LOGIN, - POP3_AUTH_LOGIN_PASSWD, - POP3_AUTH_CRAMMD5, - POP3_AUTH_DIGESTMD5, - POP3_AUTH_DIGESTMD5_RESP, - POP3_AUTH_NTLM, - POP3_AUTH_NTLM_TYPE2MSG, - POP3_AUTH_GSSAPI, - POP3_AUTH_GSSAPI_TOKEN, - POP3_AUTH_GSSAPI_NO_DATA, - POP3_AUTH_XOAUTH2, - POP3_AUTH_CANCEL, - POP3_AUTH_FINAL, + POP3_AUTH, POP3_APOP, POP3_USER, POP3_PASS, @@ -77,14 +65,11 @@ struct pop3_conn { have been received so far */ size_t strip; /* Number of bytes from the start to ignore as non-body */ + struct SASL sasl; /* SASL-related storage */ unsigned int authtypes; /* Accepted authentication types */ - unsigned int authmechs; /* Accepted SASL authentication mechanisms */ unsigned int preftype; /* Preferred authentication type */ - unsigned int prefmech; /* Preferred SASL authentication mechanism */ - unsigned int authused; /* SASL auth mechanism used for the connection */ char *apoptimestamp; /* APOP timestamp from the server greeting */ bool tls_supported; /* StartTLS capability supported by server */ - bool mutual_auth; /* Mutual authentication enabled (GSSAPI only) */ }; extern const struct Curl_handler Curl_handler_pop3; |