Merge branch 'enum-error-handling' into rs-nasl-unsafe

greenbone · Dec 5, 2024 · a37a524 · a37a524
2 parents 006040b + 0f63731
commit a37a524
Show file tree

Hide file tree

Showing 41 changed files with 1,432 additions and 977 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ message ("-- Configuring the Scanner...")
 
 # VERSION: Always include major, minor and patch level.
 project (openvas
-  VERSION 23.11.0
+  VERSION 23.12.1
   LANGUAGES C)
 
 if (POLICY CMP0005)

diff --git a/charts/openvasd/Chart.yaml b/charts/openvasd/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "23.11.0"
+appVersion: "23.12.1"
diff --git a/doc/manual/nasl/built-in-functions/network-functions/open_priv_sock_tcp.md b/doc/manual/nasl/built-in-functions/network-functions/open_priv_sock_tcp.md
@@ -6,11 +6,13 @@
 
 ## SYNOPSIS
 
-*any* **open_priv_sock_tcp**(dport: *int*, sport: *int*);
+*any* **open_priv_sock_tcp**(dport: *int*, sport: *int*, timeout: *int*);
 
-**open_priv_sock_tcp** takes two named integer arguments:
+**open_priv_sock_tcp** takes three named integer arguments:
 - dport is the destination port
-- sport is the source port, which may be inferior to 1024.
+- sport is the source port, which may be inferior to 1024. This argument is optional.
+  If it is not set, the function will try to open a socket on any port from 1 to 1023.
+- timeout: An integer with the timeout value in seconds.  The default timeout is controlled by a global value.
 
 ## DESCRIPTION
 

diff --git a/doc/manual/nasl/built-in-functions/network-functions/recv_line.md b/doc/manual/nasl/built-in-functions/network-functions/recv_line.md
@@ -27,7 +27,7 @@ String with the received data or NULL on error.
 
 ## EXAMPLES
 
-**1**: Open a socket, recieve data, close the socket and finally display the data.
+**1**: Open a socket, receive data, close the socket and finally display the data.
 ```cpp
 soc = open_sock_tcp(port);
 data = recv_line(socket: soc, length: 4096, timeout: 10);

diff --git a/misc/table_driven_lsc.c b/misc/table_driven_lsc.c
@@ -1051,22 +1051,25 @@ call_rs_notus (const char *ip_str, const char *hostname, const char *pkg_list,
             {
               g_string_printf (res,
                                "\nVulnerable package: %s\n"
-                               "Installed version:    %s\n"
-                               "Fixed version:      <=%s\n"
-                               "Fixed version:      >=%s\n",
-                               pkg->pkg_name, pkg->install_version,
-                               pkg->range->start, pkg->range->stop);
+                               "Installed version:    %s-%s\n"
+                               "Fixed version:      <=%s-%s\n"
+                               "Fixed version:      >=%s-%s\n",
+                               pkg->pkg_name, pkg->pkg_name,
+                               pkg->install_version, pkg->pkg_name,
+                               pkg->range->start, pkg->pkg_name,
+                               pkg->range->stop);
             }
           else if (pkg->type == SINGLE)
             {
               int spec_len = 8 - (int) strlen (pkg->version->specifier);
               g_string_printf (res,
                                "\nVulnerable package:%*s%s\n"
-                               "Installed version:%*s%s\n"
-                               "Fixed version:%*s%s%s\n",
-                               3, "", pkg->pkg_name, 4, "",
+                               "Installed version:%*s%s-%s\n"
+                               "Fixed version:%*s%s%s-%s\n",
+                               3, "", pkg->pkg_name, 4, "", pkg->pkg_name,
                                pkg->install_version, spec_len, "",
-                               pkg->version->specifier, pkg->version->version);
+                               pkg->version->specifier, pkg->pkg_name,
+                               pkg->version->version);
             }
           else
             {