[SCM] GNU gsasl branch, master, updated. gsasl-1-3-5-ga0eec7b

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

The branch, master has been updated
       via  a0eec7b5b5b980f7aa4645e9b3a217e7c73c7c38 (commit)
       via  b832270684e3a978d1ee08a9b721d5855e15118a (commit)
       via  5b26be26bd8411f799c92278872d6894ee23b746 (commit)
       via  c9915a238127f35de23806e10342b9a92b712d40 (commit)
      from  3eaca2c13cf526d7cacb0e983a6d51df61fec35b (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 a0eec7b5b5b980f7aa4645e9b3a217e7c73c7c38
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 8 18:04:44 2009 +0200

    Start to use X.Y.Z versioning scheme.

commit b832270684e3a978d1ee08a9b721d5855e15118a
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 8 18:04:16 2009 +0200

    Test new SHA-1 APIs.

commit 5b26be26bd8411f799c92278872d6894ee23b746
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 8 17:50:29 2009 +0200

    Add new APIs to linker script.

commit c9915a238127f35de23806e10342b9a92b712d40
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 8 17:48:32 2009 +0200

    Bump versions.

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

Summary of changes:
 NEWS                 |    2 ++
 configure.ac         |    2 +-
 lib/NEWS             |    5 +++++
 lib/configure.ac     |   13 ++++++++-----
 lib/src/gsasl.h      |    6 +++---
 lib/src/libgsasl.map |    7 +++++++
 tests/crypto.c       |   34 +++++++++++++++++++++++++++-------
 7 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index dc2a666..bbf2684 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Note that changes to the GNU SASL Library is documented in 
lib/NEWS.
 This file track changes to the remaining, non-library, parts of GNU
 SASL.  That include the manual, the command line tool, and self tests.
 
+* Version 1.3.90 (unreleased) [experimental]
+
 * Version 1.3 (released 2009-10-08)
 
 ** Experimental support for SCRAM-SHA-1 added.
diff --git a/configure.ac b/configure.ac
index f7709c5..d2c0a06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GNU SASL], [1.3], address@hidden, [gsasl])
+AC_INIT([GNU SASL], [1.3.90], address@hidden, [gsasl])
 AC_CONFIG_AUX_DIR([lib/build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/NEWS b/lib/NEWS
index a11093b..e02f4f5 100644
--- a/lib/NEWS
+++ b/lib/NEWS
@@ -2,6 +2,11 @@ GNU SASL LIBRARY NEWS -- History of user-visible changes.
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
 See the end for copying conditions.
 
+* Version 1.3.90 (unreleased) [experimental]
+
+** API and ABI modifications.
+No changes since last version.
+
 * Version 1.3 (released 2009-10-08)
 
 ** libgsasl: Implement SCRAM-SHA-1.
diff --git a/lib/configure.ac b/lib/configure.ac
index fdac1a6..50b24cd 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # MA 02110-1301, USA.
 
 AC_PREREQ(2.61)
-AC_INIT([libgsasl], [1.3], address@hidden)
+AC_INIT([libgsasl], [1.3.90], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -29,7 +29,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 13)
-AC_SUBST(LT_REVISION, 4)
+AC_SUBST(LT_REVISION, 5)
 AC_SUBST(LT_AGE, 6)
 
 # Used when creating libgsasl-XX.def.
@@ -386,14 +386,17 @@ gl_INIT
 
 sj_UPDATE_HEADER_VERSION([$srcdir/src/gsasl.h])
 
-MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\(.*\)\..*/\1/g'`
-MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)/\1/g'`
-NUMBER_VERSION=`printf "0x%02x%02x00" $MAJOR_VERSION $MINOR_VERSION`
+MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`
+MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`
+PATCH_VERSION=`echo $PACKAGE_VERSION | sed 's/.*\..*\.\(.*\)/\1/g'`
+NUMBER_VERSION=`printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSION 
$PATCH_VERSION`
 sj_UPDATE_HEADER([$srcdir/src/gsasl.h],
                 "s/VERSION_MAJOR .*/VERSION_MAJOR $MAJOR_VERSION/")
 sj_UPDATE_HEADER([$srcdir/src/gsasl.h],
                 "s/VERSION_MINOR .*/VERSION_MINOR $MINOR_VERSION/")
 sj_UPDATE_HEADER([$srcdir/src/gsasl.h],
+                "s/VERSION_PATCH .*/VERSION_PATCH $PATCH_VERSION/")
+sj_UPDATE_HEADER([$srcdir/src/gsasl.h],
                 "s/VERSION_NUMBER .*/VERSION_NUMBER $NUMBER_VERSION/")
 
 AC_SUBST([WARN_CFLAGS])
diff --git a/lib/src/gsasl.h b/lib/src/gsasl.h
index 4e36ce8..13b3691 100644
--- a/lib/src/gsasl.h
+++ b/lib/src/gsasl.h
@@ -51,7 +51,7 @@ extern "C"
    * version number.  Used together with gsasl_check_version() to
    * verify header file and run-time library consistency.
    */
-# define GSASL_VERSION "1.3"
+# define GSASL_VERSION "1.3.90"
 
   /**
    * GSASL_VERSION_MAJOR
@@ -84,7 +84,7 @@ extern "C"
    *
    * Since: 1.1
    */
-# define GSASL_VERSION_PATCH 0
+# define GSASL_VERSION_PATCH 90
 
   /**
    * GSASL_VERSION_NUMBER
@@ -95,7 +95,7 @@ extern "C"
    *
    * Since: 1.1
    */
-# define GSASL_VERSION_NUMBER 0x010300
+# define GSASL_VERSION_NUMBER 0x01035a
 
   /* RFC 2222: SASL mechanisms are named by strings, from 1 to 20
    * characters in length, consisting of upper-case letters, digits,
diff --git a/lib/src/libgsasl.map b/lib/src/libgsasl.map
index a92097a..26fcbc9 100644
--- a/lib/src/libgsasl.map
+++ b/lib/src/libgsasl.map
@@ -139,3 +139,10 @@ LIBGSASL_1.1 {
   local:
     *;
 };
+
+LIBGSASL_1.4
+{
+  global:
+    gsasl_sha1;
+    gsasl_hmac_sha1;
+} LIBGSASL_1.1;
diff --git a/tests/crypto.c b/tests/crypto.c
index 1a332fc..af2802e 100644
--- a/tests/crypto.c
+++ b/tests/crypto.c
@@ -35,7 +35,7 @@ doit (void)
 #define SIZE 10
   char tmp[SIZE];
   char savetmp[SIZE];
-  char *md5;
+  char *hash;
   size_t tmplen;
   int rc;
   Gsasl *ctx;
@@ -63,25 +63,45 @@ doit (void)
     fail ("gsasl_random memcmp fail\n");
   success("gsasl_random\n");
 
-  rc = gsasl_md5 ("abc", 3, &md5);
+  rc = gsasl_md5 ("abc", 3, &hash);
   if (rc != GSASL_OK)
     fail ("gsasl_md5 %d: %s\n", rc, gsasl_strerror (rc));
-  if (memcmp (md5, "\x90\x01\x50\x98\x3C\xD2\x4F\xB0"
+  if (memcmp (hash, "\x90\x01\x50\x98\x3C\xD2\x4F\xB0"
              "\xD6\x96\x3F\x7D\x28\xE1\x7F\x72", 16) != 0)
     fail ("gsasl_md5 memcmp fail\n");
   success("gsasl_md5\n");
-  gsasl_free (md5);
+  gsasl_free (hash);
 
   rc = gsasl_hmac_md5 ("\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
                       "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", 16,
-                      "Hi There", 8, &md5);
+                      "Hi There", 8, &hash);
   if (rc != GSASL_OK)
     fail ("gsasl_hmac_md5 %d: %s\n", rc, gsasl_strerror (rc));
-  if (memcmp (md5, "\x92\x94\x72\x7a\x36\x38\xbb\x1c"
+  if (memcmp (hash, "\x92\x94\x72\x7a\x36\x38\xbb\x1c"
              "\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d", 16) != 0)
     fail ("gsasl_hmac_md5 memcmp fail\n");
   success("gsasl_hmac_md5\n");
-  gsasl_free (md5);
+  gsasl_free (hash);
+
+  rc = gsasl_sha1 ("abc", 3, &hash);
+  if (rc != GSASL_OK)
+    fail ("gsasl_sha1 %d: %s\n", rc, gsasl_strerror (rc));
+  if (memcmp (hash, "\xa9\x99\x3e\x36\x47\x06\x81\x6a\xba\x3e\x25"
+             "\x71\x78\x50\xc2\x6c\x9c\xd0\xd8\x9d", 20) != 0)
+    fail ("gsasl_sha1 memcmp fail\n");
+  success("gsasl_sha1\n");
+  gsasl_free (hash);
+
+  rc = gsasl_hmac_sha1 ("\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+                       "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", 16,
+                       "Hi There", 8, &hash);
+  if (rc != GSASL_OK)
+    fail ("gsasl_hmac_sha1 %d: %s\n", rc, gsasl_strerror (rc));
+  if (memcmp (hash, "\x67\x5b\x0b\x3a\x1b\x4d\xdf\x4e\x12\x48\x72"
+             "\xda\x6c\x2f\x63\x2b\xfe\xd9\x57\xe9", 20) != 0)
+    fail ("gsasl_hmac_sha1 memcmp fail\n");
+  success("gsasl_hmac_sha1\n");
+  gsasl_free (hash);
 
   gsasl_done (ctx);
 }


hooks/post-receive
-- 
GNU gsasl