[SCM] GNU gsasl branch, master, updated. gsasl-1-2-107-g1790cf1

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=1790cf17dfdcb14ce629e0551be0d3499ba43f4e

The branch, master has been updated
       via  1790cf17dfdcb14ce629e0551be0d3499ba43f4e (commit)
       via  c8e8e7066abb50069214dc5677f6efaa3cf8b04f (commit)
      from  577799d4584b5e9469d88eadbd69ecef9ee9cb6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1790cf17dfdcb14ce629e0551be0d3499ba43f4e
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 8 16:37:10 2009 +0200

    Add.

commit c8e8e7066abb50069214dc5677f6efaa3cf8b04f
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 8 16:35:40 2009 +0200

    Make SCRAM lowest priority for now.

-----------------------------------------------------------------------

Summary of changes:
 NEWS           |    7 ++++++-
 lib/src/init.c |   12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index ebf8082..4e55da1 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,12 @@ SASL.  That include the manual, the command line tool, and 
self tests.
 
 * Version 1.3 (unreleased)
 
-** Support for SCRAM-SHA-1 added.
+** Experimental support for SCRAM-SHA-1 added.
+Please test it but don't put it into production use, the RFC have not
+been finalized yet.  For this reason, the mechanism priority list is
+such that SCRAM-SHA-1 will never be selected over any other mechanism
+(including PLAIN, CRAM-MD5, and DIGEST-MD5).  When it has been tested
+further, we'll make SCRAM-SHA-1 the preferred mechanism after GSSAPI.
 
 ** gsasl: Fix libintl-related build errors on MinGW.
 Tiny patch from "carlo.bramix" <address@hidden>.
diff --git a/lib/src/init.c b/lib/src/init.c
index f764bdb..cc7d60f 100644
--- a/lib/src/init.c
+++ b/lib/src/init.c
@@ -54,6 +54,12 @@ register_builtin_mechs (Gsasl * ctx)
 {
   int rc = GSASL_OK;
 
+#ifdef USE_SCRAM_SHA1
+  rc = gsasl_register (ctx, &gsasl_scram_sha1_mechanism);
+  if (rc != GSASL_OK)
+    return rc;
+#endif /* USE_SCRAM_SHA1 */
+
 #ifdef USE_ANONYMOUS
   rc = gsasl_register (ctx, &gsasl_anonymous_mechanism);
   if (rc != GSASL_OK)
@@ -102,12 +108,6 @@ register_builtin_mechs (Gsasl * ctx)
     return rc;
 #endif /* USE_CRAM_MD5 */
 
-#ifdef USE_SCRAM_SHA1
-  rc = gsasl_register (ctx, &gsasl_scram_sha1_mechanism);
-  if (rc != GSASL_OK)
-    return rc;
-#endif /* USE_SCRAM_SHA1 */
-
 #ifdef USE_GSSAPI
   rc = gsasl_register (ctx, &gsasl_gssapi_mechanism);
   if (rc != GSASL_OK)


hooks/post-receive
-- 
GNU gsasl