[SCM] GNU gnutls branch, master, updated. gnutls_3_0_2-2-g7b17a89

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

The branch, master has been updated
       via  7b17a893779cccd3836e83d325ee19e5b0f01534 (commit)
       via  1f1cff99abc8c5817ea6c453affe9d4e6684721e (commit)
      from  6d0c9ec20702e9f06eebd8aef94ad5650568e174 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 doc/cha-programs.texi        |  103 ++++++++---------------------------------
 lib/includes/gnutls/compat.h |    3 -
 2 files changed, 20 insertions(+), 86 deletions(-)

diff --git a/doc/cha-programs.texi b/doc/cha-programs.texi
index 9371312..7bb39ac 100644
--- a/doc/cha-programs.texi
+++ b/doc/cha-programs.texi
@@ -425,39 +425,9 @@ Usage:  gnutls-cli [options] hostname
 @subsection Example client PSK connection
 @cindex PSK client
 
-To connect to a server using PSK authentication, you may use something
-like:
-
address@hidden
-$ gnutls-cli -p 5556 test.gnutls.org --pskusername jas \
-  --pskkey 9e32cf7786321a828ef7668f09fb35db \
-  --priority NORMAL:-KX-ALL:+ECDHE-PSK:+DHE-PSK:+PSK
address@hidden smallexample
-
-If your server only supports the PSK ciphersuite, connecting to it
-should be as simple as connecting to the server:
-
address@hidden
-$ ./gnutls-cli -p 5556 localhost
-Resolving 'localhost'...
-Connecting to '127.0.0.1:5556'...
-- PSK client callback.
-Enter PSK identity: psk_identity
-Enter password: 
-- PSK authentication.
-- Version: TLS1.1
-- Key Exchange: PSK
-- Cipher: AES-128-CBC
-- MAC: SHA1
-- Compression: NULL
-- Handshake was completed
-
-- Simple Client Mode:
address@hidden smallexample
-
-If the server supports several cipher suites, you may need to force it
-to chose PSK by using a cipher priority parameter such as in the
-example below:
+To connect to a server using PSK authentication, you need to enable
+the choice of PSK by using a cipher priority parameter such as in the
+example below.
 
 @smallexample
 $ ./gnutls-cli -p 5556 localhost --pskusername psk_identity \
@@ -718,15 +688,9 @@ gnutls-serv --http \
             --pgpcertfile openpgp-server.txt
 @end smallexample
 
-The next step is to add support for SRP authentication.
-
address@hidden
-srptool --create-conf srp-tpasswd.conf
-srptool --passwd-conf srp-tpasswd.conf --username jas --passwd srp-passwd.txt
-Enter password: [TYPE "foo"]
address@hidden smallexample
-
-Start the server with SRP support:
+The next step is to add support for SRP authentication. This requires
+an SRP password file (see @ref{Invoking srptool}).
+To start the server with SRP support:
 
 @smallexample
 gnutls-serv --http \
@@ -734,13 +698,8 @@ gnutls-serv --http \
             --srppasswd srp-passwd.txt
 @end smallexample
 
-Let's also add support for PSK.
-
address@hidden
-$ psktool --passwd psk-passwd.txt
address@hidden smallexample
-
-Start the server with PSK support:
+Let's also start a server with support for PSK. This would require
+a password file created with @code{psktool} (see @ref{Invoking psktool}).
 
 @smallexample
 gnutls-serv --http \
@@ -764,40 +723,6 @@ gnutls-serv --http \
             --pskpasswd psk-passwd.txt
 @end smallexample
 
address@hidden
-* Example server PSK connection::
address@hidden menu
-
address@hidden Example server PSK connection
address@hidden Example server PSK connection
address@hidden PSK server
-
-To set up a PSK server with @code{gnutls-serv} you need to create PSK
-password file. This is illustrated in the example below, where a password
-is provided at the prompt.
-
address@hidden
-$ ./psktool -u psk_identity -p psks.txt
-Enter password:
-Key stored to psks.txt
-$ cat psks.txt
-psk_identity:88f3824b3e5659f52d00e959bacab954b6540344
-$
address@hidden smallexample
-
-After this, start the server pointing to the password file.  We
-disable DHE-PSK.
-
address@hidden
-$ ./gnutls-serv --pskpasswd psks.txt  --pskhint psk_identity_hint \
-  --priority NORMAL:-DHE-PSK
-Set static Diffie-Hellman parameters, consider --dhparams.
-Echo Server ready. Listening to port '5556'.
address@hidden smallexample
-
-You can now connect to the server using a PSK client as in @ref{Example
-client PSK connection}.
-
 @node Invoking psktool
 @section Invoking psktool
 @cindex psktool
@@ -817,6 +742,18 @@ Usage : psktool [options]
      -h, --help               shows this help text
 @end smallexample
 
+The generation of a PSK password file is illustrated in the example below. 
+The password is provided in the prompt.
+
address@hidden
+$ ./psktool -u psk_identity -p psks.txt
+Enter password:
+Key stored to psks.txt
+$ cat psks.txt
+psk_identity:88f3824b3e5659f52d00e959bacab954b6540344
+$
address@hidden smallexample
+
 @node Invoking srptool
 @section Invoking srptool
 @anchor{srptool}
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 918a40b..6c8e3c1 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -49,9 +49,6 @@ extern "C"
 /* gnutls_connection_end_t was made redundant in 2.99.0 */
 #define gnutls_connection_end_t unsigned int
 
-/* no longer valid since 2.99.0 */
-#define gnutls_transport_set_lowat(session, num)
-
 /* Stuff deprected in 2.x */
 #define gnutls_cipher_algorithm gnutls_cipher_algorithm_t
 #define gnutls_kx_algorithm gnutls_kx_algorithm_t


hooks/post-receive
-- 
GNU gnutls