email: Introduced the GSSAPI states

diff --git a/lib/imap.c b/lib/imap.c
index 0570ecc8d3a02a5b6999066d833f086712c765b1..7d44e4408021e6b433acaff41e350a33af93381f 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -24,6 +24,7 @@
  * RFC3501 IMAPv4 protocol
  * RFC4422 Simple Authentication and Security Layer (SASL)
  * RFC4616 PLAIN authentication
+ * RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism
  * RFC4959 IMAP Extension for SASL Initial Client Response
  * RFC5092 IMAP URL Scheme
  * RFC6749 OAuth 2.0 Authorization Framework
@@ -433,6 +434,9 @@ static void state(struct connectdata *conn, imapstate newstate)
     "AUTHENTICATE_DIGESTMD5_RESP",
     "AUTHENTICATE_NTLM",
     "AUTHENTICATE_NTLM_TYPE2MSG",
+    "AUTHENTICATE_GSSAPI",
+    "AUTHENTICATE_GSSAPI_TOKEN",
+    "AUTHENTICATE_GSSAPI_NO_DATA",
     "AUTHENTICATE_XOAUTH2",
     "AUTHENTICATE_CANCEL",
     "AUTHENTICATE_FINAL",

diff --git a/lib/imap.h b/lib/imap.h
index 3abe3e46726432b3ac25a3ee96fa53f5aecb71cb..c7f76f5a0225a7c5b1fa9a58dd52f6758cba6151 100644 (file)
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -43,6 +43,9 @@ typedef enum {
   IMAP_AUTHENTICATE_DIGESTMD5_RESP,
   IMAP_AUTHENTICATE_NTLM,
   IMAP_AUTHENTICATE_NTLM_TYPE2MSG,
+  IMAP_AUTHENTICATE_GSSAPI,
+  IMAP_AUTHENTICATE_GSSAPI_TOKEN,
+  IMAP_AUTHENTICATE_GSSAPI_NO_DATA,
   IMAP_AUTHENTICATE_XOAUTH2,
   IMAP_AUTHENTICATE_CANCEL,
   IMAP_AUTHENTICATE_FINAL,

diff --git a/lib/pop3.c b/lib/pop3.c
index 314567e3fcbe1b16fa94e311db653fb760369ff3..ff7e0cabc39503cada9059d92395c1994128185b 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -27,6 +27,7 @@
  * RFC2831 DIGEST-MD5 authentication
  * RFC4422 Simple Authentication and Security Layer (SASL)
  * RFC4616 PLAIN authentication
+ * RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism
  * RFC5034 POP3 SASL Authentication Mechanism
  * RFC6749 OAuth 2.0 Authorization Framework
  * Draft   LOGIN SASL Mechanism <draft-murchison-sasl-login-00.txt>
@@ -320,6 +321,9 @@ static void state(struct connectdata *conn, pop3state newstate)
     "AUTH_DIGESTMD5_RESP",
     "AUTH_NTLM",
     "AUTH_NTLM_TYPE2MSG",
+    "AUTH_GSSAPI",
+    "AUTH_GSSAPI_TOKEN",
+    "AUTH_GSSAPI_NO_DATA",
     "AUTH_XOAUTH2",
     "AUTH_CANCEL",
     "AUTH_FINAL",

diff --git a/lib/pop3.h b/lib/pop3.h
index fcc83957837caf777cdde23eec29426d47f5fe9f..39e35d2da29ca9c89f0930a8f7ea7bb2b2065035 100644 (file)
--- a/lib/pop3.h
+++ b/lib/pop3.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 2014, 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
@@ -43,6 +43,9 @@ typedef enum {
   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,

diff --git a/lib/smtp.c b/lib/smtp.c
index da760172408128eb6b44c5d425988dc49f557dfb..a98f114eae354c33fea76492c799025fff49ebf5 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -24,6 +24,7 @@
  * RFC3207 SMTP over TLS
  * RFC4422 Simple Authentication and Security Layer (SASL)
  * RFC4616 PLAIN authentication
+ * RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism
  * RFC4954 SMTP Authentication
  * RFC5321 SMTP protocol
  * RFC6749 OAuth 2.0 Authorization Framework
@@ -317,6 +318,9 @@ static void state(struct connectdata *conn, smtpstate newstate)
     "AUTH_DIGESTMD5_RESP",
     "AUTH_NTLM",
     "AUTH_NTLM_TYPE2MSG",
+    "AUTH_GSSAPI",
+    "AUTH_GSSAPI_TOKEN",
+    "AUTH_GSSAPI_NO_DATA",
     "AUTH_XOAUTH2",
     "AUTH_CANCEL",
     "AUTH_FINAL",

diff --git a/lib/smtp.h b/lib/smtp.h
index 017b943362cb685e88c2d12fe8372035cc6cdd1c..e2a19c639fe98b5552a1528f4b251ef6c79dddc5 100644 (file)
--- a/lib/smtp.h
+++ b/lib/smtp.h
@@ -44,6 +44,9 @@ typedef enum {
   SMTP_AUTH_DIGESTMD5_RESP,
   SMTP_AUTH_NTLM,
   SMTP_AUTH_NTLM_TYPE2MSG,
+  SMTP_AUTH_GSSAPI,
+  SMTP_AUTH_GSSAPI_TOKEN,
+  SMTP_AUTH_GSSAPI_NO_DATA,
   SMTP_AUTH_XOAUTH2,
   SMTP_AUTH_CANCEL,
   SMTP_AUTH_FINAL,