[GNUnet-SVN] r1542 - in GNUnet: m4 src/applications/fs/ecrs

[grothoff]

Author: grothoff
Date: 2005-07-14 14:39:14 -0700 (Thu, 14 Jul 2005)
New Revision: 1542

Modified:
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/fs/ecrs/search.c
Log:
fixing #856

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2005-07-14 21:22:35 UTC (rev 1541)
+++ GNUnet/m4/Makefile.in       2005-07-14 21:39:14 UTC (rev 1542)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,7 +33,6 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
 host_triplet = @host@
 subdir = m4
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
@@ -184,8 +183,6 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -352,7 +349,7 @@
 clean-generic:
 
 distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"

Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c    2005-07-14 21:22:35 UTC (rev 
1541)
+++ GNUnet/src/applications/fs/ecrs/search.c    2005-07-14 21:39:14 UTC (rev 
1542)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004 Christian Grothoff (and other contributing 
authors)
+     (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other 
contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -416,7 +416,7 @@
        memcpy(kb, &value[1], size);
        ECRS_decryptInPlace(&ps->decryptKey,
                            &kb->nblock,
-                           size - sizeof(KBlock));
+                           size - sizeof(KBlock) - sizeof(unsigned int));
        ret = processNBlock(&kb->nblock,
                            &ps->decryptKey,
                            size - sizeof(KNBlock) + sizeof(NBlock),