Skip to content

Commit

Permalink
Merge branch 'main' into fix-c-formatting2
Browse files Browse the repository at this point in the history
  • Loading branch information
jjnicola authored Jan 27, 2025
2 parents eab9a1c + 1c48c95 commit fecae2f
Show file tree
Hide file tree
Showing 17 changed files with 5 additions and 1,620 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ message ("-- Configuring the Scanner...")

# VERSION: Always include major, minor and patch level.
project (openvas
VERSION 23.15.2
VERSION 23.15.3
LANGUAGES C)

if (POLICY CMP0005)
Expand Down
2 changes: 1 addition & 1 deletion charts/openvasd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.15.2"
appVersion: "23.15.3"
4 changes: 2 additions & 2 deletions misc/network.c
Original file line number Diff line number Diff line change
Expand Up @@ -1956,9 +1956,9 @@ open_sock_tcp (struct script_infos *args, unsigned int port, int timeout)
if (log_count < 3)
{
g_message ("open_sock_tcp: %s:%d time-out.", ip_str, port);
log_count++;
kb_item_set_int_with_main_kb_check (kb, buffer, log_count);
}
log_count++;
kb_item_set_int_with_main_kb_check (kb, buffer, log_count);
if ((log_count >= attempts) && (attempts != 0))
{
/* After some unsuccessfully attempts, the port is set to closed to
Expand Down
12 changes: 0 additions & 12 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
clap = { version = "4.3.0", features = ["derive", "env"] }
cmac = "0.7.2"
configparser = "3"
crossbeam-channel = { version = "0.5.8", optional = true }
ctr = "0.9.2"
des = "0.8.1"
digest = "0.10.6"
dns-lookup = "2.0"
flate2 = "1.0.25"
futures = "0.3.30"
futures-util = "0.3.28"
generic-array = "0.14.7"
generic-array_new = { version = "1.1", package = "generic-array" }
generic-array = "0.14"
glob = "0.3.1"
h2 = "0.4.4"
hex = "0.4.3"
Expand Down Expand Up @@ -82,7 +80,6 @@ walkdir = "2"
x509-certificate = "0.23.1"
x509-parser = "0.16.0"

rayon = { version = "1.8.0", optional = true }
pcap = { version = "1.0.0", optional = true }
pnet_base = { version = "0.33.0", optional = true }
pnet = { version = "0.33.0", optional = true }
Expand Down Expand Up @@ -111,11 +108,9 @@ once_cell = "1.20.1"
insta = { version = "1.41.1", features = ["ron"] }

[features]
dep-graph-parallel = ["rayon", "crossbeam-channel"]
openvas_serde_support = []
serde_support = []
default = [
"dep-graph-parallel",
"openvas_serde_support",
"enforce-no-trailing-arguments",
"serde_support",
Expand Down
3 changes: 0 additions & 3 deletions rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,3 @@ pub mod osp;
pub mod scanner;
pub mod scheduling;
pub mod storage;

#[allow(unused)]
mod plugin_scheduler;
144 changes: 0 additions & 144 deletions rust/src/plugin_scheduler/README.md

This file was deleted.

61 changes: 0 additions & 61 deletions rust/src/plugin_scheduler/dep_graph/README.md

This file was deleted.

12 changes: 0 additions & 12 deletions rust/src/plugin_scheduler/dep_graph/error.rs

This file was deleted.

Loading

0 comments on commit fecae2f

Please sign in to comment.