Change GNU TLS into GnuTLS.

20 files changed, 32 insertions, 40 deletions

diff --git a/AUTHORS b/AUTHORS
index 6bb050b364..686adf6d92 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-GNU TLS AUTHORS -- Information about the authors.
+GnuTLS AUTHORS -- Information about the authors.
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 See the end for copying conditions.
diff --git a/ChangeLog.1 b/ChangeLog.1
index fcfd07701a..65a7cb0aab 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -19549,7 +19549,7 @@
 
 	* Makefile.am, NEWS, README, THANKS, acconfig.h, acinclude.m4,
 	configure.in, lib/Makefile.am, src/Makefile.am: Initialized
-	repository for GNU TLS
+	repository for GnuTLS
 
 ----------------------------------------------------------------------
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
diff --git a/NEWS b/NEWS
index 9514582860..558db4a9d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU TLS NEWS -- History of user-visible changes.                -*- outline -*-
+GnuTLS NEWS -- History of user-visible changes.                -*- outline -*-
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 See the end for copying conditions.
@@ -1041,7 +1041,7 @@ No changes since last version.
 
 ** libgnutls: Fix X.509 certificate chain validation error. [GNUTLS-SA-2008-3]
 The flaw makes it possible for man in the middle attackers (i.e.,
-active attackers) to assume any name and trick GNU TLS clients into
+active attackers) to assume any name and trick GnuTLS clients into
 trusting that name.  Thanks for report and analysis from Martin von
 Gagern <Martin.vGagern@gmx.net>.  [CVE-2008-4989]
 
@@ -1316,7 +1316,7 @@ No changes since last version.
 
 ** libgnutls: Fix X.509 certificate chain validation error. [GNUTLS-SA-2008-3]
 The flaw makes it possible for man in the middle attackers (i.e.,
-active attackers) to assume any name and trick GNU TLS clients into
+active attackers) to assume any name and trick GnuTLS clients into
 trusting that name.  Thanks for report and analysis from Martin von
 Gagern <Martin.vGagern@gmx.net>.  [CVE-2008-4989]
 
@@ -1733,7 +1733,7 @@ certificate.  Reported by Michael Meskes <meskes@debian.org> in
 
 ** libgnutls: Fix X.509 certificate chain validation error. [GNUTLS-SA-2008-3]
 The flaw makes it possible for man in the middle attackers (i.e.,
-active attackers) to assume any name and trick GNU TLS clients into
+active attackers) to assume any name and trick GnuTLS clients into
 trusting that name.  Thanks for report and analysis from Martin von
 Gagern <Martin.vGagern@gmx.net>.  [CVE-2008-4989]
 
diff --git a/README b/README
index a6e0599209..d010cc54fa 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-GNU TLS README -- Important introductory notes.
+GnuTLS README -- Important introductory notes.
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 See the end for copying conditions.
diff --git a/README-alpha b/README-alpha
index 49cdc97733..1da7ec81c5 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,4 +1,4 @@
-GNU TLS README-alpha -- Information for developers.             -*- outline -*-
+GnuTLS README-alpha -- Information for developers.              -*- outline -*-
 Copyright (C) 2009, 2010  Free Software Foundation, Inc.
 See the end for copying conditions.
 
diff --git a/THANKS b/THANKS
index 46c3347a00..a774394338 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-GNU TLS THANKS -- Acknowledgements.
+GnuTLS THANKS -- Acknowledgements.
 Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavrogiannopoulos
 See the end for copying conditions.
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index cf6185ec40..5efa562605 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -2,7 +2,7 @@
 @comment %**start of header
 @setfilename gnutls.info
 @include version.texi
-@settitle GNU TLS @value{VERSION}
+@settitle GnuTLS @value{VERSION}
 
 @c don't indent the paragraphs.
 @paragraphindent 0
@@ -15,7 +15,7 @@
 @finalout
 @copying
 This manual is last updated @value{UPDATED} for version
-@value{VERSION} of GNU TLS.
+@value{VERSION} of GnuTLS.
 
 Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
@@ -37,15 +37,15 @@ Documentation License''.
 @dircategory System Administration
 @direntry
 * certtool: (gnutls)Invoking certtool.	Manipulate certificates and keys.
-* gnutls-serv: (gnutls)Invoking gnutls-serv.	GNU TLS test server.
-* gnutls-cli: (gnutls)Invoking gnutls-cli.	GNU TLS test client.
-* gnutls-cli-debug: (gnutls)Invoking gnutls-cli-debug.	GNU TLS debug client.
+* gnutls-serv: (gnutls)Invoking gnutls-serv.	GnuTLS test server.
+* gnutls-cli: (gnutls)Invoking gnutls-cli.	GnuTLS test client.
+* gnutls-cli-debug: (gnutls)Invoking gnutls-cli-debug.	GnuTLS debug client.
 * psktool: (gnutls)Invoking psktool.	Simple TLS-Pre-Shared-Keys manager.
 * srptool: (gnutls)Invoking srptool.	Simple SRP password tool.
 @end direntry
 
 @titlepage
-@title GNU TLS
+@title GnuTLS
 @subtitle Transport Layer Security Library for the GNU system
 @subtitle for version @value{VERSION}, @value{UPDATED}
 @sp 7
@@ -65,7 +65,7 @@ Documentation License''.
 
 @ifnottex
 @node Top
-@top GNU TLS
+@top GnuTLS
 
 @insertcopying
 @end ifnottex
@@ -3153,7 +3153,7 @@ computer.  It sets up a TLS connection and forwards data from the
 standard input to the secured socket and vice versa.
 
 @verbatim
-GNU TLS test client
+GnuTLS test client
 Usage:  gnutls-cli [options] hostname
 
      -d, --debug integer      Enable debugging
@@ -3325,7 +3325,7 @@ Checking for OpenPGP authentication support (TLS extension)... no
 Simple server program that listens to incoming TLS connections.
 
 @verbatim
-GNU TLS test server
+GnuTLS test server
 Usage: gnutls-serv [options]
 
      -d, --debug integer      Enable debugging
diff --git a/doc/manpages/gnutls-cli-debug.1 b/doc/manpages/gnutls-cli-debug.1
index eec3972ae9..bec44cdec5 100644
--- a/doc/manpages/gnutls-cli-debug.1
+++ b/doc/manpages/gnutls-cli-debug.1
@@ -1,6 +1,6 @@
 .TH gnutls\-cli\-debug 1 "December 1st 2003"
 .SH NAME
-gnutls\-cli\-debug \- GNU TLS test client, with verbose output
+gnutls\-cli\-debug \- GnuTLS test client, with verbose output
 .SH SYNOPSIS
 gnutls\-cli\-debug [\fIoptions\fR] \fIhostname\fI
 .SH DESCRIPTION
diff --git a/doc/manpages/gnutls-cli.1 b/doc/manpages/gnutls-cli.1
index 4e1f48372e..61a68926c0 100644
--- a/doc/manpages/gnutls-cli.1
+++ b/doc/manpages/gnutls-cli.1
@@ -1,6 +1,6 @@
 .TH gnutls\-cli 1 "December 1st 2003"
 .SH NAME
-gnutls\-cli \- GNU TLS test client
+gnutls\-cli \- GnuTLS test client
 .SH SYNOPSIS
 gnutls\-cli [\fIoptions\fR] \fIhostname\fI
 .SH DESCRIPTION
diff --git a/doc/manpages/gnutls-serv.1 b/doc/manpages/gnutls-serv.1
index 710dfc3d19..a70b8d53de 100644
--- a/doc/manpages/gnutls-serv.1
+++ b/doc/manpages/gnutls-serv.1
@@ -1,6 +1,6 @@
 .TH gnutls\-serv 1 "December 1st 2003"
 .SH NAME
-gnutls\-serv \- GNU TLS test server
+gnutls\-serv \- GnuTLS test server
 .SH SYNOPSIS
 gnutls\-serv [\fIoptions\fR]
 .SH DESCRIPTION
diff --git a/doc/manpages/srptool.1 b/doc/manpages/srptool.1
index 1ae0b2555b..51c8093f90 100644
--- a/doc/manpages/srptool.1
+++ b/doc/manpages/srptool.1
@@ -5,7 +5,7 @@ srptool \- Simple SRP password tool
 srptool [\fIoptions\fR]
 .SH DESCRIPTION
 Very simple program that emulates the programs in the Stanford SRP
-(Secure Remote Password) libraries using GNU TLS.
+(Secure Remote Password) libraries using GnuTLS.
 It is intended for use in places where you don't expect SRP
 authentication to be the used for system users.
 
diff --git a/doc/reference/gnutls-docs.sgml b/doc/reference/gnutls-docs.sgml
index 07d798a581..f970dcdde3 100644
--- a/doc/reference/gnutls-docs.sgml
+++ b/doc/reference/gnutls-docs.sgml
@@ -3,16 +3,15 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GNU TLS API Reference Manual</title>
+    <title>GnuTLS API Reference Manual</title>
   </bookinfo>
 
   <chapter id="intro">
-    <title>GNU TLS API Reference Manual</title>
+    <title>GnuTLS API Reference Manual</title>
 
     <para>
-      This is the GNU TLS library, a implementation of the TLS
-      (Transport Layer Security) and SSL (Secure Sockets Layer) for
-      the GNU project.
+      GnuTLS is a implementation of the TLS (Transport Layer Security)
+      and SSL (Secure Sockets Layer) protocols for the GNU project.
     </para>
 
     <para>
diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index 3c0a404070..15b9137817 100644
--- a/lib/ext_safe_renegotiation.c
+++ b/lib/ext_safe_renegotiation.c
@@ -37,12 +37,6 @@ _gnutls_safe_renegotiation_recv_params (gnutls_session_t session,
 
   DECR_LEN (data_size, len + 1 /* count the first byte and payload */ );
 
-  if (session->internals.priorities.disable_safe_renegotiation != 0)
-    {
-      gnutls_assert ();
-      return 0;
-    }
-
   /* It is not legal to receive this extension on a renegotiation and
    * not receive it on the initial negotiation.
    */
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index b1b44c7ba0..fe7cd9809f 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -864,7 +864,6 @@ _gnutls_server_select_suite (gnutls_session_t session, opaque * data,
 
   /* First, check for safe renegotiation SCSV.
    */
-  if (session->internals.priorities.disable_safe_renegotiation == 0) 
   {
     int offset;
 
diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index 715b43b691..40c8447a5c 100644
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -126,7 +126,7 @@ static void __gaa_helpsingle(char short_name, char *name,
 
 void gaa_help(void)
 {
-	printf("GNU TLS test client\nUsage:  gnutls-cli [options] hostname\n\n\n");
+	printf("GnuTLS test client\nUsage:  gnutls-cli [options] hostname\n\n\n");
 	__gaa_helpsingle('d', "debug", "integer ", "Enable debugging");
 	__gaa_helpsingle('r', "resume", "", "Connect, establish a session. Connect again and resume this session.");
 	__gaa_helpsingle('e', "rehandshake", "", "Connect, establish a session and rehandshake immediately.");
diff --git a/src/cli.gaa b/src/cli.gaa
index 72502f7bf6..79866f4fa3 100644
--- a/src/cli.gaa
+++ b/src/cli.gaa
@@ -9,7 +9,7 @@ void cli_version(void);
 
 #}
 
-helpnode "GNU TLS test client\nUsage:  gnutls-cli [options] hostname\n\n"
+helpnode "GnuTLS test client\nUsage:  gnutls-cli [options] hostname\n\n"
 
 #int debug;
 option (d, debug) INT "integer" { $debug = $1 } "Enable debugging" 
diff --git a/src/serv-gaa.c b/src/serv-gaa.c
index 3f762efec8..ab7472b3fe 100644
--- a/src/serv-gaa.c
+++ b/src/serv-gaa.c
@@ -124,7 +124,7 @@ static void __gaa_helpsingle(char short_name, char *name,
 
 void gaa_help(void)
 {
-	printf("GNU TLS test server\nUsage: gnutls-serv [options]\n\n\n");
+	printf("GnuTLS test server\nUsage: gnutls-serv [options]\n\n\n");
 	__gaa_helpsingle('d', "debug", "integer ", "Enable debugging");
 	__gaa_helpsingle('g', "generate", "", "Generate Diffie-Hellman and RSA-EXPORT Parameters.");
 	__gaa_helpsingle('p', "port", "integer ", "The port to connect to.");
diff --git a/src/serv.gaa b/src/serv.gaa
index 474542d4d2..f4607f0e5e 100644
--- a/src/serv.gaa
+++ b/src/serv.gaa
@@ -7,7 +7,7 @@ void serv_version(void);
 
 #}
 
-helpnode "GNU TLS test server\nUsage: gnutls-serv [options]\n\n"
+helpnode "GnuTLS test server\nUsage: gnutls-serv [options]\n\n"
 
 #int debug;
 option (d, debug) INT "integer" { $debug = $1 } "Enable debugging" 
diff --git a/src/tls_test-gaa.c b/src/tls_test-gaa.c
index c4f396de8e..d27ee1cd66 100644
--- a/src/tls_test-gaa.c
+++ b/src/tls_test-gaa.c
@@ -128,7 +128,7 @@ static void __gaa_helpsingle(char short_name, char *name,
 
 void gaa_help(void)
 {
-	printf("GNU TLS debug client\nUsage: gnutls-cli-debug [options] hostname\n\n\n");
+	printf("GnuTLS debug client\nUsage: gnutls-cli-debug [options] hostname\n\n\n");
 	__gaa_helpsingle('p', "port", "integer ", "The port to connect to.");
 	__gaa_helpsingle('d', "debug", "integer ", "Enable debugging");
 	__gaa_helpsingle('V', "verbose", "", "More verbose output");
diff --git a/src/tls_test.gaa b/src/tls_test.gaa
index f28d99d136..64a3a960ec 100644
--- a/src/tls_test.gaa
+++ b/src/tls_test.gaa
@@ -11,7 +11,7 @@ void tls_test_version(void);
 
 #}
 
-helpnode "GNU TLS debug client\nUsage: gnutls-cli-debug [options] hostname\n\n"
+helpnode "GnuTLS debug client\nUsage: gnutls-cli-debug [options] hostname\n\n"
 
 #int pp;
 option (p, port) INT "integer" { $pp = $1 } "The port to connect to."