param->type, param->server, NULL, NULL,
param->login, param->login,
param->password, NULL);
- else
+ else if (!strcmp(param->type, "SCRAM-SHA-1"))
+ /* 7th argument has to be NULL here, to stop libetpan sending the
+ * a= attribute in its initial SCRAM-SHA-1 message to server. At least
+ * Dovecot 2.2 doesn't seem to like that, and will not authenticate
+ * succesfully. */
+ r = mailimap_authenticate(param->imap,
+ param->type, NULL, NULL, NULL,
+ NULL, param->login,
+ param->password, NULL);
+ else
r = mailimap_authenticate(param->imap,
param->type, NULL, NULL, NULL,
param->login, param->login,
case IMAP_AUTH_DIGEST_MD5:
ok = imap_cmd_login(session, user, pass, "DIGEST-MD5");
break;
+ case IMAP_AUTH_SCRAM_SHA1:
+ ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
+ break;
case IMAP_AUTH_LOGIN:
ok = imap_cmd_login(session, user, pass, "LOGIN");
break;
"\t ANONYMOUS %d\n"
"\t CRAM-MD5 %d\n"
"\t DIGEST-MD5 %d\n"
+ "\t SCRAM-SHA-1 %d\n"
"\t LOGIN %d\n"
"\t GSSAPI %d\n",
imap_has_capability(session, "ANONYMOUS"),
imap_has_capability(session, "CRAM-MD5"),
imap_has_capability(session, "DIGEST-MD5"),
+ imap_has_capability(session, "SCRAM-SHA-1"),
imap_has_capability(session, "LOGIN"),
imap_has_capability(session, "GSSAPI"));
if (imap_has_capability(session, "CRAM-MD5"))
ok = imap_cmd_login(session, user, pass, "CRAM-MD5");
if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "DIGEST-MD5"))
ok = imap_cmd_login(session, user, pass, "DIGEST-MD5");
+ if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "SCRAM-SHA-1"))
+ ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "GSSAPI"))
ok = imap_cmd_login(session, user, pass, "GSSAPI");
if (ok == MAILIMAP_ERROR_LOGIN) /* we always try LOGIN before giving up */
"DIGEST-MD5 SASL plugin is installed.");
}
+ if (type == IMAP_AUTH_SCRAM_SHA1) {
+ ext_info = _("\n\nSCRAM-SHA-1 logins only work if libetpan has been "
+ "compiled with SASL support and the "
+ "SCRAM SASL plugin is installed.");
+ }
+
if (time(NULL) - last_login_err > 10) {
if (!prefs_common.no_recv_err_panel) {
alertpanel_error_log(_("Connection to %s failed: "
COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
COMBOBOX_ADD (menu, "GSSAPI", IMAP_AUTH_GSSAPI);
COMBOBOX_ADD (menu, "DIGEST-MD5", IMAP_AUTH_DIGEST_MD5);
+ COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);