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

diff --git a/NEWS b/NEWS
index ccce513becf091b152202453b724fa3e85a00c44..a6eda04333eef3831d372bc56ff15f1f8e96ccdd 100644 (file)
--- 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 92c3bd63f882e53528a9d73194433453dc923806..d6979b8cba765417d10e15343cfea14262716216 100644 (file)
--- 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 4226e773d4361f3d9f7bc4d1729c87b2ccb72fc5..9c53d7cf081825bab81a85cb8ccf36754c8952c4 100644 (file)
--- 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;