[SCM] GNU gnutls branch, master, updated. gnutls_3_0_11-46-g3548a95

[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=3548a950551354f5cb367b08632d7ea81e4a62f1

The branch, master has been updated
       via  3548a950551354f5cb367b08632d7ea81e4a62f1 (commit)
       via  ab06513726eebecd815ea0ed40fed2c5351b5e23 (commit)
       via  f76c914e10873b7bd74311a88e6f76f4a4c5ee82 (commit)
      from  12010d79115a397dd257b258c35956567610b825 (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 3548a950551354f5cb367b08632d7ea81e4a62f1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jan 14 10:50:27 2012 +0100

    better indent gnutls_certificate_set_x509_simple_pkcs12_file to allow them 
being found by doc script.

commit ab06513726eebecd815ea0ed40fed2c5351b5e23
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jan 14 10:43:17 2012 +0100

    caption is set on enumerations in texinfo. Unfortunately they are not 
visible to the pdf output due to a probable bug in texinfo.

commit f76c914e10873b7bd74311a88e6f76f4a4c5ee82
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jan 14 09:55:10 2012 +0100

    Added pkcs12_simple function.

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

Summary of changes:
 doc/cha-cert-auth2.texi         |    2 +-
 doc/gnutls.texi                 |    3 +++
 doc/scripts/gdoc                |    6 ++----
 doc/scripts/split-texi.pl       |   13 +++++++++----
 lib/includes/gnutls/gnutls.h.in |    6 ++----
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/doc/cha-cert-auth2.texi b/doc/cha-cert-auth2.texi
index 7bbd311..01ac7b5 100644
--- a/doc/cha-cert-auth2.texi
+++ b/doc/cha-cert-auth2.texi
@@ -678,7 +678,7 @@ session, as shown in @ref{ex:pkcs11-client}. In addition
 the following functions can be used to load PKCS #11 key and
 certificates by specifying a PKCS #11 URL instead of a filename.
 
address@hidden,gnutls_certificate_set_x509_key_file}
address@hidden,gnutls_certificate_set_x509_key_file,gnutls_certificate_set_x509_simple_pkcs12_file}
 
 @node The p11tool application
 @subsection The p11tool application
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index e538d09..a63e720 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -132,7 +132,10 @@ Documentation License''.
 @end macro
 
 @macro showenumdesc{ref,cap}
address@hidden Figure,\ref\
 @include enums/\ref\
address@hidden
address@hidden float
 @end macro
 
 @contents
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index ea798b9..307888c 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -376,9 +376,8 @@ sub output_enum_texinfo {
     my $check;
     my $type;
 
-    print "address@hidden Table,$name\n";
-
-    print "address@hidden";
+    print "address@hidden $name\n";
+    print "address@hidden";
 
     $check=0;
     foreach $parameter (@{$args{'parameterlist'}}) {
@@ -395,7 +394,6 @@ sub output_enum_texinfo {
        print $out . "\n";
     }
     print "address@hidden itemize\n";
-    print "address@hidden float\n";
 }
 
 # output in html
diff --git a/doc/scripts/split-texi.pl b/doc/scripts/split-texi.pl
index a7ee518..b4b0087 100755
--- a/doc/scripts/split-texi.pl
+++ b/doc/scripts/split-texi.pl
@@ -21,7 +21,7 @@ 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(.*)\n/) && ($i < 5)) { $i=$i+1; $key = 
$lines[$i]; }
   } else {
     while( !($key =~ m/^\\functionTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; $key 
= $lines[$i]; }
   }
@@ -30,19 +30,24 @@ sub key_of_record {
 }
 
 if ($enum == 1) {
-  $/="address@hidden float";          # Records are separated by blank lines.
+  $/="address@hidden itemize";          # Records are separated by blank lines.
 } else {
   $/="\n\\end{function}";          # Records are separated by blank lines.
 }
 @records = <>;  # Read in whole file, one record per array element.
 
+$/="\n";
+
 mkdir $dir;
 
address@hidden = sort { key_of_record($a) cmp key_of_record($b) } @records;
+if ($enum == 0) {
+  @records = sort { key_of_record($a) cmp key_of_record($b) } @records;
+}
+
 foreach (@records) {
   $key = $_;
   if ($enum == 1) {
-    $key =~ m/address@hidden Table,(.*)/;
+    $key =~ m/address@hidden(.*)\n/;
     $key = $1;
   } else {
     $key =~ m/\\functionTitle\{(.*)\}/;
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 296ca4a..22aba97 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1111,11 +1111,9 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t 
session);
   void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session,
                                                   int status);
 
-  int gnutls_certificate_set_x509_simple_pkcs12_file
-    (gnutls_certificate_credentials_t res, const char *pkcs12file,
+  int gnutls_certificate_set_x509_simple_pkcs12_file 
(gnutls_certificate_credentials_t res, const char *pkcs12file,
      gnutls_x509_crt_fmt_t type, const char *password);
-  int gnutls_certificate_set_x509_simple_pkcs12_mem
-    (gnutls_certificate_credentials_t res, const gnutls_datum_t * p12blob,
+  int gnutls_certificate_set_x509_simple_pkcs12_mem 
(gnutls_certificate_credentials_t res, const gnutls_datum_t * p12blob,
      gnutls_x509_crt_fmt_t type, const char *password);
 
 /* New functions to allow setting already parsed X.509 stuff.


hooks/post-receive
-- 
GNU gnutls