Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SCRAM SHA1 authentication for mnesia and ODBC #171

Merged
merged 9 commits into from
May 14, 2014
Merged

Conversation

fenek
Copy link
Member

@fenek fenek commented Apr 10, 2014

Rebased version of #130

@fenek
Copy link
Member Author

fenek commented Apr 10, 2014

Hmm... still needs some easy migration for ODBC. :)

@fenek
Copy link
Member Author

fenek commented Apr 16, 2014

Added migration function, config option for interation count and did some general refactoring/cleanup. I think it's final version for review. :)

badlop and others added 9 commits May 13, 2014 16:12
Works with internal (mnesia) storage.

Conflicts:
	apps/ejabberd/src/cyrsasl_anonymous.erl
	apps/ejabberd/src/cyrsasl_digest.erl
	apps/ejabberd/src/cyrsasl_plain.erl
	apps/ejabberd/src/ejabberd_c2s.erl
	src/ejabberd.app
	src/ejabberd_auth_ldap.erl
	src/ejabberd_auth_pam.erl

Fix and improve support for SCRAM auth method (EJAB-1196)

Conflicts:
	apps/ejabberd/src/ejabberd_auth.erl
	apps/ejabberd/src/ejabberd_auth_internal.erl
	rel/files/ejabberd.cfg
	src/ejabberd_auth_ldap.erl
	src/ejabberd_auth_pam.erl
	src/ejabberd_piefxis.erl
Add config option for SCRAM iteration count
michalwski added a commit that referenced this pull request May 14, 2014
SCRAM SHA1 authentication for mnesia and ODBC
@michalwski michalwski merged commit 52dcc3c into master May 14, 2014
@michalwski michalwski deleted the scram-rebase branch June 5, 2014 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants