Skip to content

Commit

Permalink
Merge pull request #784 from jjnicola/file-type-pref
Browse files Browse the repository at this point in the history
If the nvt preference is "file" type, encode it into Base64 format.
  • Loading branch information
mattmundell authored Oct 10, 2019
2 parents 843e790 + a093336 commit 5b41558
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix array index error when modifying roles and groups [#762](https://github.com/greenbone/gvmd/pull/762)
- Make get_settings return only one setting when setting_id is given [#780](https://github.com/greenbone/gvmd/pull/780)
- Fix percent sign escaping in report_port_count [#783](https://github.com/greenbone/gvmd/pull/783)
- If the nvt preference is "file" type, encode it into Base64 format [#784](https://github.com/greenbone/gvmd/pull/784)

### Removed
- The handling of NVT updates via OTP has been removed. [#575](https://github.com/greenbone/gvmd/pull/575)
Expand Down
9 changes: 7 additions & 2 deletions src/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -3785,9 +3785,12 @@ target_osp_ssh_credential (target_t target)
if (strcmp (type, "usk") == 0)
{
const char *private_key = credential_iterator_private_key (&iter);
gchar *base64 = g_base64_encode ((guchar *) private_key,
strlen (private_key));
osp_credential_set_auth_data (osp_credential,
"private",
private_key);
"private", base64);
g_free (base64);

}
cleanup_iterator (&iter);
return osp_credential;
Expand Down Expand Up @@ -4091,6 +4094,8 @@ launch_osp_openvas_task (task_t task, target_t target, const char *scan_id,
osp_value = g_strdup (split_value[0]);
g_strfreev (split_value);
}
else if (strcmp (type, "file") == 0)
osp_value = g_base64_encode ((guchar*) value, strlen (value));

osp_vt = g_hash_table_lookup (vts_hash_table, oid);
if (osp_vt)
Expand Down

0 comments on commit 5b41558

Please sign in to comment.