[SCM] GNU gss branch, master, updated. gss-0-1-3-5-g760853a

[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 gss".

http://git.savannah.gnu.org/cgit/gss.git/commit/?id=760853a2d4f8524a2438d2414f8478e211f24cb9

The branch, master has been updated
       via  760853a2d4f8524a2438d2414f8478e211f24cb9 (commit)
       via  4d6575b10a57517372e2b06c62abd57183123b40 (commit)
       via  d1ddbf408de8cad57d8c4a00ddf5a28aab5bb492 (commit)
      from  5c1f1b988b98cafa2860e543da9c155c834401b6 (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 760853a2d4f8524a2438d2414f8478e211f24cb9
Author: Simon Josefsson <address@hidden>
Date:   Thu Mar 18 13:00:53 2010 +0100

    KRB5: Fix bug in channel binding computation.

commit 4d6575b10a57517372e2b06c62abd57183123b40
Author: Simon Josefsson <address@hidden>
Date:   Thu Mar 18 10:24:56 2010 +0100

    Mention gengetopt.

commit d1ddbf408de8cad57d8c4a00ddf5a28aab5bb492
Author: Simon Josefsson <address@hidden>
Date:   Tue Mar 16 10:16:41 2010 +0100

    Dist shishi.conf.

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

Summary of changes:
 NEWS                |    2 ++
 README-alpha        |    2 +-
 lib/krb5/checksum.c |    2 +-
 tests/Makefile.am   |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 16b8454..7a7f7fe 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ See the end for copying conditions.
 
 * Version 0.1.4 (unreleased)
 
+** KRB5: Fix bug in channel binding computation.
+
 ** API and ABI modifications.
 No changes since last version.
 
diff --git a/README-alpha b/README-alpha
index 0f67778..34df964 100644
--- a/README-alpha
+++ b/README-alpha
@@ -31,7 +31,7 @@ some hints:
 gNewSense/Debian/Ubuntu:
 sudo apt-get install git-core autoconf automake libtool gettext cvs
 sudo apt-get install texinfo texlive texlive-generic-recommended 
texlive-extra-utils
-sudo apt-get install help2man gtk-doc-tools valgrind
+sudo apt-get install help2man gtk-doc-tools valgrind gengetopt
 sudo apt-get install libshishi-dev
 
 To download the version controlled sources:
diff --git a/lib/krb5/checksum.c b/lib/krb5/checksum.c
index 1b3bb6f..bf0b86c 100644
--- a/lib/krb5/checksum.c
+++ b/lib/krb5/checksum.c
@@ -61,7 +61,7 @@ hash_cb (OM_uint32 *minor_status,
     }
 
   memset (buf, 0, 4 * 4);
-  memcpy (buf, input_chan_bindings->application_data.value,
+  memcpy (buf + 4 * 4, input_chan_bindings->application_data.value,
          input_chan_bindings->application_data.length);
 
   res = shishi_md5 (k5->sh, buf, len, out);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 451a8dd..53e07fd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,7 +40,7 @@ TESTS = $(buildtests) threadsafety
 check_PROGRAMS = $(buildtests)
 dist_check_SCRIPTS = threadsafety
 
-EXTRA_DIST = krb5context.key krb5context.tkt utils.c
+EXTRA_DIST = krb5context.key krb5context.tkt utils.c shishi.conf
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@


hooks/post-receive
-- 
GNU gss