Revert "Update to 7.40.1"

[platform/upstream/curl.git] / lib / pop3.h

diff --git a/lib/pop3.h b/lib/pop3.h
index ca9e84b..fcc8395 100644 (file)
--- a/lib/pop3.h
+++ b/lib/pop3.h
@@ -43,7 +43,9 @@ typedef enum {
   POP3_AUTH_DIGESTMD5_RESP,
   POP3_AUTH_NTLM,
   POP3_AUTH_NTLM_TYPE2MSG,
-  POP3_AUTH,
+  POP3_AUTH_XOAUTH2,
+  POP3_AUTH_CANCEL,
+  POP3_AUTH_FINAL,
   POP3_APOP,
   POP3_USER,
   POP3_PASS,
@@ -57,28 +59,27 @@ typedef enum {
    perhaps the SessionHandle is changed between the times the connection is
    used. */
 struct POP3 {
-  curl_off_t *bytecountp;
-  char *user;             /* User name string */
-  char *passwd;           /* Password string */
-  curl_ftptransfer transfer;
+  curl_pp_transfer transfer;
+  char *id;               /* Message ID */
+  char *custom;           /* Custom Request */
 };
 
 /* pop3_conn is used for struct connection-oriented data in the connectdata
    struct */
 struct pop3_conn {
   struct pingpong pp;
-  char *mailbox;          /* Message ID */
-  char *custom;           /* Custom Request */
+  pop3state state;        /* Always use pop3.c:state() to change state! */
+  bool ssldone;           /* Is connect() over SSL done? */
   size_t eob;             /* Number of bytes of the EOB (End Of Body) that
                              have been received so far */
   size_t strip;           /* Number of bytes from the start to ignore as
                              non-body */
-  unsigned int authtypes; /* Supported authentication types */
+  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 */
-  pop3state state;        /* Always use pop3.c:state() to change state! */
-  bool ssldone;           /* Is connect() over SSL done? */
   bool tls_supported;     /* StartTLS capability supported by server */
 };
 
@@ -86,9 +87,13 @@ extern const struct Curl_handler Curl_handler_pop3;
 extern const struct Curl_handler Curl_handler_pop3s;
 
 /* Authentication type flags */
-#define POP3_TYPE_CLEARTEXT 0x0001
-#define POP3_TYPE_APOP      0x0002
-#define POP3_TYPE_SASL      0x0004
+#define POP3_TYPE_CLEARTEXT (1 << 0)
+#define POP3_TYPE_APOP      (1 << 1)
+#define POP3_TYPE_SASL      (1 << 2)
+
+/* Authentication type values */
+#define POP3_TYPE_NONE      0
+#define POP3_TYPE_ANY       ~0U
 
 /* This is the 5-bytes End-Of-Body marker for POP3 */
 #define POP3_EOB "\x0d\x0a\x2e\x0d\x0a"