bumped versiongnutls_3_1_1

7 files changed, 14 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 1be343205d..c733a928e9 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ GnuTLS NEWS -- History of user-visible changes.                -*- outline -*-
 Copyright (C) 2000-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 3.1.1 (unreleased)
+* Version 3.1.1 (released 2012-09-02)
 
 ** gnutls-serv: Listens on IPv6. Patch by Bernhard R. Link.
 
@@ -13,6 +13,10 @@ assume the PKCS #8 file format, instead of ignoring the password.
 
 ** tpmtool: No longer asks for key password in registered keys.
 
+** libgnutls: Elliptic curve code was optimized by Ilya Tumaykin.
+wmNAF is now used for point multiplication and other optimizations.
+(the major part of the work was done during Google Summer of Code).
+
 ** libgnutls: The default pull_timeout_function only uses select
 instead of a combination of select() and recv() to prevent issues
 when used in stream sockets in some systems.
diff --git a/configure.ac b/configure.ac
index 81b6e8a75e..ccd272921e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.1.0], [bug-gnutls@gnu.org])
+AC_INIT([GnuTLS], [3.1.1], [bug-gnutls@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi
index b7c35c957c..977f69d428 100644
--- a/doc/invoke-gnutls-cli.texi
+++ b/doc/invoke-gnutls-cli.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-gnutls-cli.texi)
 # 
-# It has been AutoGen-ed  June  6, 2012 at 09:11:09 PM by AutoGen 5.16
+# It has been AutoGen-ed  September  2, 2012 at 08:04:10 PM by AutoGen 5.16
 # From the definitions    ../src/cli-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -48,6 +48,7 @@ USAGE:  gnutls-cli [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostname]
        --ocsp                 Enable OCSP certificate verification
                                 - disabled as --no-ocsp
    -r, --resume               Establish a session and resume
+   -b, --heartbeat            Activate heartbeat support
    -e, --rehandshake          Establish a session and rehandshake
        --noticket             Don't accept session tickets
    -s, --starttls             Connect, establish a plain session and start TLS.
diff --git a/doc/invoke-gnutls-serv.texi b/doc/invoke-gnutls-serv.texi
index bd7b686468..f544225080 100644
--- a/doc/invoke-gnutls-serv.texi
+++ b/doc/invoke-gnutls-serv.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-gnutls-serv.texi)
 # 
-# It has been AutoGen-ed  May  9, 2012 at 08:06:12 PM by AutoGen 5.16
+# It has been AutoGen-ed  September  2, 2012 at 08:04:11 PM by AutoGen 5.16
 # From the definitions    ../src/serv-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -52,6 +52,7 @@ USAGE:  gnutls-serv [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
                                   0 to 17000
    -a, --disable-client-cert  Do not request a client certificate
    -r, --require-client-cert  Require a client certificate
+   -b, --heartbeat            Activate heartbeat support
        --x509fmtder           Use DER format for certificates to read from
        --priority=str         Priorities string
        --dhparams=file        DH params file to use
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index ed5cb2fe6d..0b5c972e45 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -39,9 +39,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces changed/added/removed:   CURRENT++       REVISION=0
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
-  AC_SUBST(LT_CURRENT, 39)
+  AC_SUBST(LT_CURRENT, 40)
   AC_SUBST(LT_REVISION, 0)
-  AC_SUBST(LT_AGE, 11)
+  AC_SUBST(LT_AGE, 12)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
   AC_SUBST(LT_SSL_REVISION, 2)
diff --git a/src/cli-args.c b/src/cli-args.c
index 09e65e55b1..a7c035bb8a 100644
--- a/src/cli-args.c
+++ b/src/cli-args.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (cli-args.c)
  *  
- *  It has been AutoGen-ed  June  6, 2012 at 09:09:25 PM by AutoGen 5.16
+ *  It has been AutoGen-ed  September  2, 2012 at 08:04:08 PM by AutoGen 5.16
  *  From the definitions    cli-args.def
  *  and the template file   options
  *
diff --git a/src/cli-args.h b/src/cli-args.h
index e8c9dacd5b..21a45f2260 100644
--- a/src/cli-args.h
+++ b/src/cli-args.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (cli-args.h)
  *  
- *  It has been AutoGen-ed  June  6, 2012 at 09:09:25 PM by AutoGen 5.16
+ *  It has been AutoGen-ed  September  2, 2012 at 08:04:08 PM by AutoGen 5.16
  *  From the definitions    cli-args.def
  *  and the template file   options
  *