[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvas-cvs
Subject:    [Openvas-commits] r22006 - in trunk/openvas-libraries: . base
From:       scm-commit () wald ! intevation ! org
Date:       2015-03-31 15:47:30
Message-ID: 20150331154730.8F89A9A213A3 () wald ! intevation ! org
[Download RAW message or body]

Author: kroosec
Date: 2015-03-31 17:47:30 +0200 (Tue, 31 Mar 2015)
New Revision: 22006

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/base/openvas_networking.c
Log:
* base/openvas_networking.c (openvas_ssh_public_from_private): Add key
type in LibSSH 0.5 case.

Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2015-03-31 15:29:36 UTC (rev 22005)
+++ trunk/openvas-libraries/ChangeLog	2015-03-31 15:47:30 UTC (rev 22006)
@@ -1,5 +1,10 @@
 2015-03-31  Hani Benhabiles <hani.benhabiles@greenbone.net>
 
+	* base/openvas_networking.c (openvas_ssh_public_from_private): Add key
+	type in LibSSH 0.5 case.
+
+2015-03-31  Hani Benhabiles <hani.benhabiles@greenbone.net>
+
 	* misc/arglists.c (arg_add_value, arg_set_value): Remove length function
 	parameter.
 

Modified: trunk/openvas-libraries/base/openvas_networking.c
===================================================================
--- trunk/openvas-libraries/base/openvas_networking.c	2015-03-31 15:29:36 UTC (rev 22005)
+++ trunk/openvas-libraries/base/openvas_networking.c	2015-03-31 15:47:30 UTC (rev 22006)
@@ -684,7 +684,9 @@
     return NULL;
   data = ssh_string_to_char (sstring);
   datalen = ssh_string_len (sstring);
-  base64 = g_base64_encode ((guchar *) data, datalen);
+  /* LibSSH 0.5 supports ssh-rsa only. */
+  base64 = g_strdup_printf ("ssh-rsa %s",
+                            g_base64_encode ((guchar *) data, datalen));
   ssh_string_free (sstring);
   g_free (data);
   return base64;

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]