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=9c254e560f904211ba0a54180a363e925e0918fe The branch, master has been updated via 9c254e560f904211ba0a54180a363e925e0918fe (commit) from ff3667c8b22564f4c48e275aa70a200f8554a110 (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 9c254e560f904211ba0a54180a363e925e0918fe Author: Simon Josefsson <[email protected]> Date: Fri Sep 11 12:17:14 2009 +0200 SCRAM: Drop unfinished SCRAM-SHA-1-PLUS support. ----------------------------------------------------------------------- Summary of changes: lib/NEWS | 1 + lib/configure.ac | 16 ++-------------- lib/scram/mechinfo.c | 24 ------------------------ lib/scram/scram.h | 2 -- lib/src/init.c | 6 ------ 5 files changed, 3 insertions(+), 46 deletions(-) diff --git a/lib/NEWS b/lib/NEWS index 1737ed3..d4b196a 100644 --- a/lib/NEWS +++ b/lib/NEWS @@ -14,6 +14,7 @@ New functions are gsasl_sha1 and gsasl_hmac_sha1. ** API and ABI modifications. GSASL_SCRAM_ITER: ADDED. GSASL_SCRAM_SALT: ADDED. +GSASL_SCRAM_SALTED_PASSWORD: ADDED. gsasl_sha1: ADDED. gsasl_hmac_sha1: ADDED. diff --git a/lib/configure.ac b/lib/configure.ac index 9e3045f..32a566a 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -152,7 +152,7 @@ AC_MSG_CHECKING([if DIGEST-MD5 should be used]) AC_MSG_RESULT($digest_md5) AM_CONDITIONAL(DIGEST_MD5, test x$digest_md5 = xyes) -# SCRAM-SHA-1 and SCRAM-SHA-1-PLUS +# SCRAM-SHA-1 AC_ARG_ENABLE(scram-sha1, AS_HELP_STRING([--enable-scram-sha1], [use the SCRAM-SHA-1 mechanism]), scram_sha1=$enableval, scram_sha1=no) @@ -163,19 +163,7 @@ fi AC_MSG_CHECKING([if SCRAM-SHA-1 should be used]) AC_MSG_RESULT($scram_sha1) -AC_ARG_ENABLE(scram-sha1-plus, - AS_HELP_STRING([--enable-scram-sha1-plus], - [use the SCRAM-SHA-1-PLUS mechanism]), - scram_sha1_plus=$enableval, scram_sha1_plus=no) -if test "$scram_sha1_plus" != "no" ; then - scram_sha1_plus=yes - AC_DEFINE(USE_SCRAM_SHA1_PLUS, 1, - [Define to 1 if you want SCRAM-SHA-1-PLUS.]) -fi -AC_MSG_CHECKING([if SCRAM-SHA-1-PLUS should be used]) -AC_MSG_RESULT($scram_sha1_plus) - -AM_CONDITIONAL(SCRAM, test "$scram_sha1$scram_sha1_plus" != "nono") +AM_CONDITIONAL(SCRAM, test "$scram_sha1" != "no") # GS2, first part AC_ARG_ENABLE(gs2, diff --git a/lib/scram/mechinfo.c b/lib/scram/mechinfo.c index 742984e..fb5751d 100644 --- a/lib/scram/mechinfo.c +++ b/lib/scram/mechinfo.c @@ -62,27 +62,3 @@ Gsasl_mechanism gsasl_scram_sha1_mechanism = { } }; #endif - -#ifdef USE_SCRAM_SHA1_PLUS -Gsasl_mechanism gsasl_scram_sha1_plus_mechanism = { - GSASL_SCRAM_SHA1_PLUS_NAME, - { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - }, - { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - } -}; -#endif diff --git a/lib/scram/scram.h b/lib/scram/scram.h index ca65105..9c24ba9 100644 --- a/lib/scram/scram.h +++ b/lib/scram/scram.h @@ -26,10 +26,8 @@ #include <gsasl.h> #define GSASL_SCRAM_SHA1_NAME "SCRAM-SHA-1" -#define GSASL_SCRAM_SHA1_PLUS_NAME "SCRAM-SHA-1-PLUS" extern Gsasl_mechanism gsasl_scram_sha1_mechanism; -extern Gsasl_mechanism gsasl_scram_sha1_plus_mechanism; int _gsasl_scram_sha1_client_start (Gsasl_session * sctx, void **mech_data); diff --git a/lib/src/init.c b/lib/src/init.c index 026f7ca..f764bdb 100644 --- a/lib/src/init.c +++ b/lib/src/init.c @@ -108,12 +108,6 @@ register_builtin_mechs (Gsasl * ctx) return rc; #endif /* USE_SCRAM_SHA1 */ -#ifdef USE_SCRAM_SHA1_PLUS - rc = gsasl_register (ctx, &gsasl_scram_sha1_plus_mechanism); - if (rc != GSASL_OK) - return rc; -#endif /* USE_SCRAM_SHA1_PLUS */ - #ifdef USE_GSSAPI rc = gsasl_register (ctx, &gsasl_gssapi_mechanism); if (rc != GSASL_OK) hooks/post-receive -- GNU gsasl _______________________________________________ Gsasl-commit mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gsasl-commit
