Commit 472d1d8e authored by Steve Holme's avatar Steve Holme
Browse files

email: Introduced the GSSAPI states

parent 629f5284

lib/imap.c

+4 −0
Original line number Diff line number Diff line
@@ -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",

lib/imap.h

+3 −0
Original line number Diff line number Diff line
@@ -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,

lib/pop3.c

+4 −0
Original line number Diff line number Diff line
@@ -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",

lib/pop3.h

+4 −1
Original line number Diff line number Diff line
@@ -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,

lib/smtp.c

+4 −0
Original line number Diff line number Diff line
@@ -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",