From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 28 Jan 2012 12:48:50 +0000 (+0100)
Subject: ssh flag is has the option to be disabled/enabled.
X-Git-Tag: gnutls_3_0_13~170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=030d8783c815aa4bababe7cca8ff538762f5a2f3;p=thirdparty%2Fgnutls.git

ssh flag is has the option to be disabled/enabled.
---

diff --git a/NEWS b/NEWS
index ccce513bec..a6eda04333 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,10 @@ See the end for copying conditions.
 
 * Version 3.0.13 (unreleased)
 
-** gnutls-cli: If no --x509cafile is provided a default is
+** gnutls-cli: added the --ssh and if specified, gnutls-cli
+will use an ssh-style authentication method.
+
+** gnutls-cli: if no --x509cafile is provided a default is
 assumed (/etc/ssl/certs/ca-certificates.crt).
 
 ** ocsptool: Added --ask parameter, to verify a certificate's
diff --git a/src/cli-args.def.in b/src/cli-args.def.in
index 92c3bd63f8..d6979b8cba 100644
--- a/src/cli-args.def.in
+++ b/src/cli-args.def.in
@@ -39,6 +39,8 @@ flag = {
 flag = {
     name      = ssh;
     descrip   = "Enable SSH-style authentication";
+    disabled;
+    disable   = "no";
     doc       = "This option will, in addition to certificate authentication, perform authentication based on stored public keys.";
 };
 
diff --git a/src/cli.c b/src/cli.c
index 4226e773d4..9c53d7cf08 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -449,7 +449,7 @@ cert_verify_callback (gnutls_session_t session)
 {
   int rc;
   unsigned int status = 0;
-  int ssh = HAVE_OPT(SSH);
+  int ssh = ENABLED_OPT(SSH);
 
   if (!x509_cafile && !pgp_keyring)
     return 0;