[SCM] GNU gnutls branch, master, updated. gnutls_3_0_3-90-gd0c67b2

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

The branch, master has been updated
       via  d0c67b24c809cd401febb2695c9173eca1e01572 (commit)
      from  85945e245f6582fdbba2c5813c71c2d014b51420 (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 d0c67b24c809cd401febb2695c9173eca1e01572
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Oct 13 17:30:08 2011 +0200

    'How to use TLS in application protocols' section was moved to introduction 
to TLS.
    Fixes in perl.

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

Summary of changes:
 doc/Makefile.am                            |    2 +-
 doc/cha-intro-tls.texi                     |    3 +++
 doc/gnutls.texi                            |    3 ---
 doc/latex/Makefile.am                      |    4 ++--
 doc/latex/gnutls.tex                       |    2 --
 doc/scripts/gdoc                           |   14 +++++++-------
 doc/scripts/mytexi2latex                   |    4 +++-
 doc/scripts/sort1.pl                       |    4 +++-
 doc/scripts/split-texi.pl                  |    8 +++++---
 doc/scripts/split.pl                       |    8 +++++---
 doc/{cha-tls-app.texi => sec-tls-app.texi} |    6 +++---
 tests/nist-pkits/build-chain               |    4 +++-
 12 files changed, 35 insertions(+), 27 deletions(-)
 rename doc/{cha-tls-app.texi => sec-tls-app.texi} (97%)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8f4d121..574bd7e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,7 +35,7 @@ gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi lgpl-2.1.texi 
gpl-3.0.texi \
        cha-ciphersuites.texi cha-copying.texi cha-functions.texi       \
        cha-gtls-app.texi cha-internals.texi cha-intro-tls.texi         \
        cha-library.texi cha-preface.texi cha-programs.texi             \
-       cha-tls-app.texi cha-errors.texi cha-support.texi
+       sec-tls-app.texi cha-errors.texi cha-support.texi
 
 # Examples.
 gnutls_TEXINFOS += examples/ex-client1.c examples/ex-client2.c         \
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 5881536..c25cfe1 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -29,6 +29,7 @@ noted otherwise.
 * The TLS Handshake Protocol::
 * TLS Extensions::
 * Selecting cryptographic key sizes::
+* How to use TLS in application protocols::
 * On SSL 2 and older protocols::
 @end menu
 
@@ -696,6 +697,8 @@ Those functions will convert a human understandable 
security parameter
 of @code{gnutls_sec_param_t} type, to a number of bits suitable for a public 
 key algorithm.
 
address@hidden sec-tls-app.texi
+
 @node On SSL 2 and older protocols
 @section On SSL 2 and older protocols
 @cindex SSL 2
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 07bf825..f4e6c80 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -152,7 +152,6 @@ Documentation License''.
 * Authentication methods::
 * More on certificate authentication::
 * How to use GnuTLS in applications::
-* How to use TLS in application protocols::
 * Included programs::
 * Internal architecture of GnuTLS::
 * Support::
@@ -178,8 +177,6 @@ Documentation License''.
 
 @include cha-gtls-app.texi
 
address@hidden cha-tls-app.texi
-
 @include cha-programs.texi
 
 @include cha-internals.texi
diff --git a/doc/latex/Makefile.am b/doc/latex/Makefile.am
index 3a030d1..0825971 100644
--- a/doc/latex/Makefile.am
+++ b/doc/latex/Makefile.am
@@ -2,7 +2,7 @@ TEX_OBJECTS = gnutls.tex macros.tex macros-epub.tex fdl.tex 
cover.tex gnutls.bib
        cover-epub.tex
 
 GEN_TEX_OBJECTS = cha-preface.tex cha-library.tex cha-intro-tls.tex 
cha-auth.tex \
-  cha-cert-auth.tex cha-gtls-app.tex cha-tls-app.tex cha-programs.tex 
cha-support.tex \
+  cha-cert-auth.tex cha-gtls-app.tex sec-tls-app.tex cha-programs.tex 
cha-support.tex \
   cha-functions.tex error_codes.tex cha-ciphersuites.tex algorithms.tex \
   cha-errors.tex alerts.tex cha-internals.tex
 
@@ -24,7 +24,7 @@ cha-cert-auth.tex: ../cha-cert-auth.texi
 cha-gtls-app.tex: ../cha-gtls-app.texi
        ../scripts/mytexi2latex $< > $@
 
-cha-tls-app.tex: ../cha-tls-app.texi
+sec-tls-app.tex: ../sec-tls-app.texi
        ../scripts/mytexi2latex $< > $@
 
 cha-programs.tex: ../cha-programs.texi
diff --git a/doc/latex/gnutls.tex b/doc/latex/gnutls.tex
index 89b92e5..bf4aaaf 100644
--- a/doc/latex/gnutls.tex
+++ b/doc/latex/gnutls.tex
@@ -68,8 +68,6 @@
 
 \input{cha-gtls-app}
 
-\input{cha-tls-app}
-
 \input{cha-programs}
 
 \input{cha-internals}
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index 7485461..91d76c0 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -1,4 +1,6 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl "$0" ${1+"$@"}'
+  & eval 'exec perl "$0" $argv:q'
+    if 0;
 
 ## Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
 ##                    added -texinfo, -listfunc, -pkg-name
@@ -314,7 +316,7 @@ sub repstr {
 
 #    print "pattern $pattern matched 1=$match1 2=$match2 3=$match3 4=$match4 
replace $repl yielded $output interpolated $return\n";
 
-    $return;
+    return;
 }
 
 sub just_highlight {
@@ -371,7 +373,7 @@ sub output_texinfo {
     }
     foreach $section (@{$args{'sectionlist'}}) {
        print "address@hidden:} " if $section ne $section_default;
-       $args{'sections'}{$section} =~ s:([{}]):address@hidden:gs;
+       $args{'sections'}{$section} =~ s:([{}]):address@hidden:gs;
        output_highlight($args{'sections'}{$section});
     }
     print "address@hidden deftypefun\n\n";
@@ -515,7 +517,7 @@ sub output_tex {
     foreach $section (@{$args{'sectionlist'}}) {
        $sec = $section;
        $sec =~ s/_/\\_/g;
-       $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
+       $sec =~ s/#([a-zA-Z\_]+)/{\\it $1}/g;
 
        print "\n\\begin{function$sec}\n";
        $out = $args{'sections'}{$section};
@@ -528,7 +530,7 @@ sub output_tex {
        $out =~ s/\n\n/\n/g;
        $out =~ s/\\:/:/g;
        $out =~ s/\-\>/\$\\rightarrow\$/g;
-       $out =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
+       $out =~ s/([0-9]+)\^([0-9]+)/\$\{$1\}\^\{$2\}\$/g;
 
        print $out;
        print "\\end{function$sec}\n";
@@ -547,8 +549,6 @@ sub output_enum_tex {
     my $check;
     my $type;
 
-    $func =~ s/_/\\_/g;
-
     print "\n\n\\begin{enum}\n";
     $name =~ s/_/\\_/g;
     print "\\enumTitle{". $name . "}\n";
diff --git a/doc/scripts/mytexi2latex b/doc/scripts/mytexi2latex
index 1ddce5d..4b9518e 100755
--- a/doc/scripts/mytexi2latex
+++ b/doc/scripts/mytexi2latex
@@ -1,4 +1,6 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}'
+  & eval 'exec perl -wST "$0" $argv:q'
+    if 0;
 
 use constant NORMAL => 0;
 use constant SKIP => 1;
diff --git a/doc/scripts/sort1.pl b/doc/scripts/sort1.pl
index 504394d..0de8182 100755
--- a/doc/scripts/sort1.pl
+++ b/doc/scripts/sort1.pl
@@ -1,4 +1,6 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}'
+  & eval 'exec perl -wST "$0" $argv:q'
+    if 0;
 
 sub key_of_record {
   local($record) = @_;
diff --git a/doc/scripts/split-texi.pl b/doc/scripts/split-texi.pl
index bd6e11e..a7ee518 100755
--- a/doc/scripts/split-texi.pl
+++ b/doc/scripts/split-texi.pl
@@ -1,4 +1,6 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
 
 $dir = shift;
 $param2 = shift;
@@ -19,9 +21,9 @@ sub key_of_record {
   my ($key) = $lines[$i]; 
 
   if ($enum == 1) {
-    while( !($key =~ m/address@hidden Table,(.*)$/) && ($i < 5)) { $i=$i+1; 
$key = $lines[$i]; }
+    while( !($key =~ m/address@hidden Table,(.*)$/) && ($i < 5)) { $i=$i+1; 
$key = $lines[$i]; }
   } else {
-    while( !($key =~ m/^$\\functionTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; 
$key = $lines[$i]; }
+    while( !($key =~ m/^\\functionTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; $key 
= $lines[$i]; }
   }
 
   return $key;
diff --git a/doc/scripts/split.pl b/doc/scripts/split.pl
index ed71634..f6e900c 100755
--- a/doc/scripts/split.pl
+++ b/doc/scripts/split.pl
@@ -1,4 +1,6 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
 
 $dir = shift;
 $param2 = shift;
@@ -19,9 +21,9 @@ sub key_of_record {
   my ($key) = $lines[$i]; 
 
   if ($enum == 1) {
-    while( !($key =~ m/^$\\enumTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; $key = 
$lines[$i]; }
+    while( !($key =~ m/^\\enumTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; $key = 
$lines[$i]; }
   } else {
-    while( !($key =~ m/^$\\functionTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; 
$key = $lines[$i]; }
+    while( !($key =~ m/^\\functionTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; $key 
= $lines[$i]; }
   }
 
   return $key;
diff --git a/doc/cha-tls-app.texi b/doc/sec-tls-app.texi
similarity index 97%
rename from doc/cha-tls-app.texi
rename to doc/sec-tls-app.texi
index b8e83ed..89a10e7 100644
--- a/doc/cha-tls-app.texi
+++ b/doc/sec-tls-app.texi
@@ -1,5 +1,5 @@
 @node How to use TLS in application protocols
address@hidden How to use @acronym{TLS} in application protocols
address@hidden How to use @acronym{TLS} in application protocols
 
 This chapter is intended to provide some hints on how to use the
 @acronym{TLS} over simple custom made application protocols.  The
@@ -12,7 +12,7 @@ but may be extended to other ones too.
 @end menu
 
 @node Separate ports
address@hidden Separate ports
address@hidden Separate ports
 
 Traditionally @acronym{SSL} was used in application protocols by
 assigning a new port number for the secure services. That way two
@@ -39,7 +39,7 @@ is a limitation on the available privileged ports, this 
approach was
 soon obsoleted.
 
 @node Upward negotiation
address@hidden Upward negotiation
address@hidden Upward negotiation
 
 Other application address@hidden LDAP, IMAP etc.}  use a
 different approach to enable the secure layer.  They use something
diff --git a/tests/nist-pkits/build-chain b/tests/nist-pkits/build-chain
index 6a125ca..e625a8c 100755
--- a/tests/nist-pkits/build-chain
+++ b/tests/nist-pkits/build-chain
@@ -1,4 +1,6 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}'
+  & eval 'exec perl -wST "$0" $argv:q'
+    if 0;
 
 use strict;
 


hooks/post-receive
-- 
GNU gnutls