[SCM] GNU gsasl branch, master, updated. gsasl-1-2-34-gf228fa2

[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=f228fa2341cb96fb4c7e63e18e961f7024e72632

The branch, master has been updated
       via  f228fa2341cb96fb4c7e63e18e961f7024e72632 (commit)
      from  164b99fa79feaab0275b67703783a8d2587eed6e (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 f228fa2341cb96fb4c7e63e18e961f7024e72632
Author: Simon Josefsson <address@hidden>
Date:   Tue Sep 8 18:20:35 2009 +0200

    Add SCRAM skeleton.

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

Summary of changes:
 lib/Makefile.am                            |    4 +++
 lib/configure.ac                           |   13 +++++++++++
 lib/{plain => scram}/Makefile.am           |   10 ++++----
 lib/{digest-md5/qop.h => scram/mechinfo.c} |   33 ++++++++++++++++++++++-----
 lib/{digest-md5/qop.h => scram/scram.h}    |   15 +++++++-----
 5 files changed, 58 insertions(+), 17 deletions(-)
 copy lib/{plain => scram}/Makefile.am (80%)
 copy lib/{digest-md5/qop.h => scram/mechinfo.c} (69%)
 copy lib/{digest-md5/qop.h => scram/scram.h} (77%)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 03706e6..05f4d1e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -58,6 +58,10 @@ if DIGEST_MD5
 SUBDIRS += digest-md5
 endif
 
+if SCRAM_SHA1
+SUBDIRS += scram
+endif
+
 if NTLM
 SUBDIRS += ntlm
 endif
diff --git a/lib/configure.ac b/lib/configure.ac
index a5cb614..ac90bce 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -152,6 +152,18 @@ AC_MSG_CHECKING([if DIGEST-MD5 should be used])
 AC_MSG_RESULT($digest_md5)
 AM_CONDITIONAL(DIGEST_MD5, test x$digest_md5 = xyes)
 
+# SCRAM-SHA1
+AC_ARG_ENABLE(scram-sha1,
+  AS_HELP_STRING([--disable-scram-sha1], [use the SCRAM-SHA1 mechanism]),
+  scram_sha1=$enableval, scram_sha1=no)
+if test "$scram_sha1" != "no" ; then
+  scram_sha1=yes
+  AC_DEFINE(USE_SCRAM_SHA1, 1, [Define to 1 if you want SCRAM-SHA1.])
+fi
+AC_MSG_CHECKING([if SCRAM-SHA1 should be used])
+AC_MSG_RESULT($scram_sha1)
+AM_CONDITIONAL(SCRAM_SHA1, test x$scram_sha1 = xyes)
+
 # GS2, first part
 AC_ARG_ENABLE(gs2,
   AS_HELP_STRING([--enable-gs2], [use the GS2 mechanism]),
@@ -390,6 +402,7 @@ AC_CONFIG_FILES([
   anonymous/Makefile
   cram-md5/Makefile
   digest-md5/Makefile
+  scram/Makefile
   external/Makefile
   gl/Makefile
   gltests/Makefile
diff --git a/lib/plain/Makefile.am b/lib/scram/Makefile.am
similarity index 80%
copy from lib/plain/Makefile.am
copy to lib/scram/Makefile.am
index 97e7e83..385aead 100644
--- a/lib/plain/Makefile.am
+++ b/lib/scram/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+# Copyright (C) 2009 Simon Josefsson
 #
 # This file is part of GNU SASL Library.
 #
@@ -21,13 +21,13 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CFLAGS += $(CFLAG_VISIBILITY)
 AM_CPPFLAGS = -I$(srcdir)/../src -I../src -I$(srcdir)/../gl -I../gl
 
-noinst_LTLIBRARIES = libgsasl-plain.la
-libgsasl_plain_la_SOURCES = plain.h mechinfo.c
+noinst_LTLIBRARIES = libgsasl-scram.la
+libgsasl_scram_la_SOURCES = scram.h mechinfo.c
 
 if CLIENT
-libgsasl_plain_la_SOURCES += client.c
+libgsasl_scram_la_SOURCES += client.c
 endif
 
 if SERVER
-libgsasl_plain_la_SOURCES += server.c
+libgsasl_scram_la_SOURCES += server.c
 endif
diff --git a/lib/digest-md5/qop.h b/lib/scram/mechinfo.c
similarity index 69%
copy from lib/digest-md5/qop.h
copy to lib/scram/mechinfo.c
index 418f998..e97da51 100644
--- a/lib/digest-md5/qop.h
+++ b/lib/scram/mechinfo.c
@@ -1,4 +1,4 @@
-/* qop.h --- Prototypes for DIGEST-MD5 qop handling.
+/* mechinfo.c --- Definition of SCRAM mechanism.
  * Copyright (C) 2009  Simon Josefsson
  *
  * This file is part of GNU SASL Library.
@@ -20,10 +20,31 @@
  *
  */
 
-#ifndef DIGEST_MD5_QOP_H
-# define DIGEST_MD5_QOP_H
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-extern int digest_md5_qopstr2qops (const char *qopstr);
-extern const char *digest_md5_qops2qopstr (int qops);
+/* Get specification. */
+#include "scram.h"
 
-#endif /* DIGEST_MD5_QOP_H */
+Gsasl_mechanism gsasl_cram_md5_mechanism = {
+  GSASL_SCRAM_SHA1_NAME,
+  {
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  {
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  }
+};
diff --git a/lib/digest-md5/qop.h b/lib/scram/scram.h
similarity index 77%
copy from lib/digest-md5/qop.h
copy to lib/scram/scram.h
index 418f998..6445ab9 100644
--- a/lib/digest-md5/qop.h
+++ b/lib/scram/scram.h
@@ -1,4 +1,4 @@
-/* qop.h --- Prototypes for DIGEST-MD5 qop handling.
+/* scram.h --- Prototypes for SCRAM mechanism
  * Copyright (C) 2009  Simon Josefsson
  *
  * This file is part of GNU SASL Library.
@@ -20,10 +20,13 @@
  *
  */
 
-#ifndef DIGEST_MD5_QOP_H
-# define DIGEST_MD5_QOP_H
+#ifndef SCRAM_H
+#define SCRAM_H
 
-extern int digest_md5_qopstr2qops (const char *qopstr);
-extern const char *digest_md5_qops2qopstr (int qops);
+#include <gsasl.h>
 
-#endif /* DIGEST_MD5_QOP_H */
+#define GSASL_SCRAM_SHA1_NAME "SCRAM-SHA1"
+
+extern Gsasl_mechanism gsasl_scram_sha1_mechanism;
+
+#endif /* SCRAM_H */


hooks/post-receive
-- 
GNU gsasl