[SCM] GNU gnutls branch, master, updated. gnutls_3_0_15-42-g1133c9d

[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=1133c9d652fb700d4330ed398429407013643bc3

The branch, master has been updated
       via  1133c9d652fb700d4330ed398429407013643bc3 (commit)
       via  e7bb0e568a2180ec9c03ab9ade7916069b613c52 (commit)
       via  30420f210235cce2fec8385d4c13636bfc5c2fc4 (commit)
       via  37689a2005b40bb1e338719c03ff74b9630e7d94 (commit)
      from  c3c8fe474c2bbda86ed1c88f2077e14d698a8c92 (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 1133c9d652fb700d4330ed398429407013643bc3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 15 00:12:48 2012 +0100

    corrected typo

commit e7bb0e568a2180ec9c03ab9ade7916069b613c52
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 15 00:11:15 2012 +0100

    reduced lines

commit 30420f210235cce2fec8385d4c13636bfc5c2fc4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 15 00:06:28 2012 +0100

    doc updates

commit 37689a2005b40bb1e338719c03ff74b9630e7d94
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Mar 14 23:53:44 2012 +0100

    added spacing

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

Summary of changes:
 doc/cha-gtls-app.texi        |    2 +-
 doc/examples/ex-verify-ssh.c |   14 +++++++-------
 src/certtool-args.def        |    2 +-
 src/p11tool-args.def         |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index 9846896..382986b 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -139,7 +139,7 @@ is not the case, the use of the operating system defaults 
is recommended. An exa
 non-native thread usage is shown below.
 
 @example
-#include <gnutls.h>
+#include <gnutls/gnutls.h>
 
 int main()
 @{
diff --git a/doc/examples/ex-verify-ssh.c b/doc/examples/ex-verify-ssh.c
index dd983ce..a748516 100644
--- a/doc/examples/ex-verify-ssh.c
+++ b/doc/examples/ex-verify-ssh.c
@@ -97,9 +97,9 @@ _ssh_verify_certificate_callback (gnutls_session_t session)
                                     GNUTLS_CRT_X509, &cert_list[0], 0);
   if (ret == GNUTLS_E_NO_CERTIFICATE_FOUND)
     {
-      fprintf(stderr, "Host %s is not known.", hostname);
+      printf("Host %s is not known.", hostname);
       if (status == 0)
-        fprintf(stderr, "Its certificate is valid for %s.\n", hostname);
+        printf("Its certificate is valid for %s.\n", hostname);
       
       /* the certificate must be printed and user must be asked on
        * whether it is trustworthy. --see gnutls_x509_crt_print() */
@@ -109,10 +109,10 @@ _ssh_verify_certificate_callback (gnutls_session_t 
session)
     }
   else if (ret == GNUTLS_E_CERTIFICATE_KEY_MISMATCH)
     {
-      fprintf(stderr, "Warning: host %s is known but has another key 
associated.", hostname);
-      fprintf(stderr, "It might be that the server has multiple keys, or you 
are under attack\n");
+      printf("Warning: host %s is known but has another key associated.", 
hostname);
+      printf("It might be that the server has multiple keys, or you are under 
attack\n");
       if (status == 0)
-        fprintf(stderr, "Its certificate is valid for %s.\n", hostname);
+        printf("Its certificate is valid for %s.\n", hostname);
       
       /* the certificate must be printed and user must be asked on
        * whether it is trustworthy. --see gnutls_x509_crt_print() */
@@ -122,7 +122,7 @@ _ssh_verify_certificate_callback (gnutls_session_t session)
     }
   else if (ret < 0)
     {
-      fprintf(stderr, "gnutls_verify_stored_pubkey: %s\n", 
gnutls_strerror(ret));
+      printf("gnutls_verify_stored_pubkey: %s\n", gnutls_strerror(ret));
       return ret;
     }
   
@@ -133,7 +133,7 @@ _ssh_verify_certificate_callback (gnutls_session_t session)
                                 GNUTLS_CRT_X509, &cert_list[0], 
                                 0, 0);
       if (ret < 0)
-        fprintf(stderr, "gnutls_store_pubkey: %s\n", gnutls_strerror(ret));
+        printf("gnutls_store_pubkey: %s\n", gnutls_strerror(ret));
     }
 
   /* notify gnutls to continue handshake normally */
diff --git a/src/certtool-args.def b/src/certtool-args.def
index b3ee295..c9726af 100644
--- a/src/certtool-args.def
+++ b/src/certtool-args.def
@@ -320,7 +320,7 @@ flag = {
     name      = sec-param;
     arg-type  = string;
     arg-name  = "Security parameter";
-    descrip   = "Specify the security level [low|legacy|normal|high|ultra].";
+    descrip   = "Specify the security level [low, legacy, normal, high, 
ultra].";
     doc      = "This is alternative to the bits option.";
 };
 
diff --git a/src/p11tool-args.def b/src/p11tool-args.def
index cc850d5..7b8e912 100644
--- a/src/p11tool-args.def
+++ b/src/p11tool-args.def
@@ -189,7 +189,7 @@ flag = {
     arg-type  = string;
     arg-name  = "Security parameter";
     descrip   = "Specify the security level";
-    doc      = "This is alternative to the bits option. Available options are 
[low|legacy|normal|high|ultra].";
+    doc      = "This is alternative to the bits option. Available options are 
[low, legacy, normal, high, ultra].";
 };
 
 


hooks/post-receive
-- 
GNU gnutls