[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-232-g63918fc

[Nikos Mavrogiannopoulos]

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 gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=63918fc4dbfbec9615ffe788a7237fb9e49375f2

The branch, master has been updated
       via  63918fc4dbfbec9615ffe788a7237fb9e49375f2 (commit)
       via  4b772e1110145dbe13d68ebcf3315441d9fa60e0 (commit)
       via  0a17bad9d6bc053f7fd52f8af4991a30b76d90ca (commit)
       via  ca47b8c78aaa3d97073d76d607eccc22b0766c7a (commit)
      from  d7eb6b9c4e71f55020f69f279f42b09780f1f48c (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 63918fc4dbfbec9615ffe788a7237fb9e49375f2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Feb 14 20:31:52 2012 +0100

    Avoid generation of invoke-* in platforms other than the development

commit 4b772e1110145dbe13d68ebcf3315441d9fa60e0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Feb 14 20:31:06 2012 +0100

    more tests

commit 0a17bad9d6bc053f7fd52f8af4991a30b76d90ca
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Feb 14 20:10:48 2012 +0100

    added cleanup-autogen.pl

commit ca47b8c78aaa3d97073d76d607eccc22b0766c7a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Feb 14 19:39:07 2012 +0100

    reset sliding window size on new epochs

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

Summary of changes:
 doc/Makefile.am                |   59 +++++++++++++++++++++++++++++-----------
 doc/scripts/Makefile.am        |    2 +-
 doc/scripts/cleanup-autogen.pl |    8 +++++
 lib/gnutls_constate.c          |    2 +
 tests/dtls/dtls                |    1 +
 5 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ea4c37f..2be2c55 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,56 +28,83 @@ if ENABLE_GTK_DOC
 SUBDIRS += reference
 endif
 
-invoke-gnutls-cli.texi: ../src/cli-args.def
+SRC_DEF_CLI = 
+SRC_DEF_CLI_DEBUG = 
+SRC_DEF_SERV = 
+SRC_DEF_CERTTOOL = 
+SRC_DEF_OCSPTOOL = 
+SRC_DEF_SRPTOOL = 
+SRC_DEF_PSKTOOL = 
+SRC_DEF_P11TOOL = 
+if WANT_TEST_SUITE
+SRC_DEF_CLI += ../src/cli-args.def
+SRC_DEF_CLI_DEBUG += ../src/cli-debug-args.def
+SRC_DEF_SERV += ../src/serv-args.def
+SRC_DEF_CERTTOOL += ../src/certtool-args.def
+SRC_DEF_OCSPTOOL += ../src/ocsptool-args.def
+SRC_DEF_SRPTOOL += ../src/srptool-args.def
+SRC_DEF_PSKTOOL += ../src/psk-args.def
+SRC_DEF_P11TOOL += ../src/p11tool-args.def
+endif
+
+invoke-gnutls-cli.texi: $(SRC_DEF_CLI)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@
 
-invoke-gnutls-cli-debug.texi: ../src/cli-debug-args.def
+invoke-gnutls-cli-debug.texi: $(SRC_DEF_CLI_DEBUG)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@
 
-invoke-gnutls-serv.texi: ../src/serv-args.def
+invoke-gnutls-serv.texi: $(SRC_DEF_SERV)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@
 
-invoke-certtool.texi: ../src/certtool-args.def
+invoke-certtool.texi: $(SRC_DEF_CERTTOOL)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@
 
-invoke-ocsptool.texi: ../src/ocsptool-args.def
+invoke-ocsptool.texi: $(SRC_DEF_OCSPTOOL)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@
 
-invoke-srptool.texi: ../src/srptool-args.def
+invoke-srptool.texi: $(SRC_DEF_SRPTOOL)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@ && \
        sed -i 's/@subheading/@subsubheading/g' ../doc/$@ && \
        sed -i 's/@section/@subsection/g' ../doc/$@
 
-invoke-psktool.texi: ../src/psk-args.def
+invoke-psktool.texi: $(SRC_DEF_PSKTOOL)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@ && \
        sed -i 's/@subheading/@subsubheading/g' ../doc/$@ && \
        sed -i 's/@section/@subsection/g' ../doc/$@
 
-invoke-p11tool.texi: ../src/p11tool-args.def
+invoke-p11tool.texi: $(SRC_DEF_P11TOOL)
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
        rm -f ../doc/$@ && \
-       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/address@hidden && \
+       mv -f ../doc/address@hidden ../doc/$@ && \
        rm -f ../src/$@ && \
        sed -i 's/@subheading/@subsubheading/g' ../doc/$@ && \
        sed -i 's/@section/@subsection/g' ../doc/$@
diff --git a/doc/scripts/Makefile.am b/doc/scripts/Makefile.am
index e2b734e..73e7790 100644
--- a/doc/scripts/Makefile.am
+++ b/doc/scripts/Makefile.am
@@ -17,4 +17,4 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-EXTRA_DIST = gdoc sort2.pl split-texi.pl
+EXTRA_DIST = gdoc sort2.pl split-texi.pl cleanup-autogen.pl
diff --git a/doc/scripts/cleanup-autogen.pl b/doc/scripts/cleanup-autogen.pl
index 7d2d43a..d792195 100755
--- a/doc/scripts/cleanup-autogen.pl
+++ b/doc/scripts/cleanup-autogen.pl
@@ -23,6 +23,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
 my $line;
 my $init = 0;
 my $menu = 0;
+my $i = 0;
 
 while ($line = <>) {
   if ($line =~ /address@hidden/) {
@@ -50,4 +51,11 @@ while ($line = <>) {
   }
 
   print $line;
+  $i++;
 }
+
+if ($i < 2) {
+  exit 1;
+}
+
+exit 0;
diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c
index 83e32ce..deac62d 100644
--- a/lib/gnutls_constate.c
+++ b/lib/gnutls_constate.c
@@ -444,6 +444,8 @@ _gnutls_epoch_set_keys (gnutls_session_t session, uint16_t 
epoch)
   if (ret < 0)
     return gnutls_assert_val (ret);
 
+  params->record_sw_size = 0;
+
   _gnutls_record_log ("REC[%p]: Epoch #%u ready\n", session, params->epoch);
 
   params->initialized = 1;
diff --git a/tests/dtls/dtls b/tests/dtls/dtls
index 9d45bf6..d159518 100755
--- a/tests/dtls/dtls
+++ b/tests/dtls/dtls
@@ -31,5 +31,6 @@ fi
 ./dtls-stress -shello 012 -sfinished 01 -cfinished 021 SHello SKeyExchange 
SHelloDone  >/dev/null 2>&1
 ./dtls-stress -shello 021 -sfinished 01 -cfinished 201 SHello SHelloDone 
CChangeCipherSpec SChangeCipherSpec SFinished  >/dev/null 2>&1
 ./dtls-stress -shello 102 -sfinished 01 -cfinished 120 SHello SHelloDone 
CKeyExchange CFinished SChangeCipherSpec SFinished  >/dev/null 2>&1
+./dtls-stress -shello 210 -sfinished 01 -cfinished 201 CChangeCipherSpec 
SChangeCipherSpec SFinished >/dev/null 2>&1
 
 exit 0


hooks/post-receive
-- 
GNU gnutls