diff options
| -rw-r--r-- | lib/imap.c | 4 | ||||
| -rw-r--r-- | lib/imap.h | 3 | ||||
| -rw-r--r-- | lib/pop3.c | 4 | ||||
| -rw-r--r-- | lib/pop3.h | 5 | ||||
| -rw-r--r-- | lib/smtp.c | 4 | ||||
| -rw-r--r-- | lib/smtp.h | 3 |
6 files changed, 22 insertions, 1 deletions
diff --git a/lib/imap.c b/lib/imap.c index 0570ecc8d..7d44e4408 100644 --- 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 3abe3e467..c7f76f5a0 100644 --- 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 314567e3f..ff7e0cabc 100644 --- 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 fcc839578..39e35d2da 100644 --- 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 da7601724..a98f114ea 100644 --- 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 017b94336..e2a19c639 100644 --- 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, |