From 0794956d181d9e8417ad4888caf7f9d20349c93f Mon Sep 17 00:00:00 2001 From: robert-schardt Date: Fri, 27 Sep 2024 07:25:37 +0200 Subject: [PATCH 01/17] Change: Update gvm-libs image in prod.Dockerfile and build.Dockerfile (#1730) * Change: Update gvm-libs image in prod.Dockerfile and build.Dockerfile * Update prod.Dockerfile --------- Co-authored-by: Robert Schardt --- .docker/build.Dockerfile | 2 +- .docker/prod-oldstable.Dockerfile | 4 ++-- .docker/prod-testing.Dockerfile | 4 ++-- .docker/prod.Dockerfile | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.docker/build.Dockerfile b/.docker/build.Dockerfile index eb1e3e1f8..2e11844a9 100644 --- a/.docker/build.Dockerfile +++ b/.docker/build.Dockerfile @@ -1,6 +1,6 @@ ARG VERSION=edge -FROM greenbone/gvm-libs:$VERSION +FROM registry.community.greenbone.net/community/gvm-libs:${VERSION} LABEL deprecated="This image is deprecated and may be removed soon." RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/.docker/prod-oldstable.Dockerfile b/.docker/prod-oldstable.Dockerfile index 41d687e40..39f8130bf 100644 --- a/.docker/prod-oldstable.Dockerfile +++ b/.docker/prod-oldstable.Dockerfile @@ -5,7 +5,7 @@ ARG GVM_LIBS_VERSION=oldstable FROM greenbone/openvas-smb:oldstable-edge AS openvas-smb -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} AS build +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} AS build COPY . /source RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ @@ -41,7 +41,7 @@ COPY --from=openvas-smb /usr/local/lib/ /usr/local/lib/ RUN cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_OLD_SYNC_SCRIPT=OFF -B/build /source RUN DESTDIR=/install cmake --build /build -- install -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} ARG TARGETPLATFORM RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ diff --git a/.docker/prod-testing.Dockerfile b/.docker/prod-testing.Dockerfile index e3e7d59be..ea214ebc2 100644 --- a/.docker/prod-testing.Dockerfile +++ b/.docker/prod-testing.Dockerfile @@ -5,7 +5,7 @@ ARG GVM_LIBS_VERSION=testing-edge FROM greenbone/openvas-smb:testing-edge AS openvas-smb -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} AS build +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} AS build COPY . /source RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ @@ -41,7 +41,7 @@ COPY --from=openvas-smb /usr/local/lib/ /usr/local/lib/ RUN cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_OLD_SYNC_SCRIPT=OFF -B/build /source RUN DESTDIR=/install cmake --build /build -- install -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} ARG TARGETPLATFORM RUN apt-get update RUN apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile index 897a97cae..5214c2262 100644 --- a/.docker/prod.Dockerfile +++ b/.docker/prod.Dockerfile @@ -4,14 +4,14 @@ ARG REPOSITORY=greenbone/openvas-scanner FROM greenbone/openvas-smb AS openvas-smb -FROM greenbone/gvm-libs:$VERSION AS build +FROM registry.community.greenbone.net/community/gvm-libs:${VERSION} AS build COPY . /source RUN sh /source/.github/install-openvas-dependencies.sh COPY --from=openvas-smb /usr/local/lib/ /usr/local/lib/ RUN cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_OLD_SYNC_SCRIPT=OFF -B/build /source RUN DESTDIR=/install cmake --build /build -- install -FROM greenbone/gvm-libs:$VERSION +FROM registry.community.greenbone.net/community/gvm-libs:${VERSION} ARG TARGETPLATFORM RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ @@ -58,4 +58,3 @@ RUN setcap cap_net_raw,cap_net_admin+eip /usr/local/sbin/openvas ENV NMAP_PRIVILEGED=1 RUN setcap cap_net_raw,cap_net_admin,cap_net_bind_service+eip /usr/bin/nmap CMD /usr/local/bin/openvasd - From 9642e33d700bd2f4ea5716cdd7a86753f0e8e318 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 27 Sep 2024 11:17:20 +0200 Subject: [PATCH 02/17] Fix: Replace libssh-gcrypt-dev with libssh-dev and libgcrypt-dev --- .github/install-openvas-dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/install-openvas-dependencies.sh b/.github/install-openvas-dependencies.sh index e8cc583d0..cae315057 100755 --- a/.github/install-openvas-dependencies.sh +++ b/.github/install-openvas-dependencies.sh @@ -18,7 +18,8 @@ apt-get update && apt-get install --no-install-recommends --no-install-suggests libksba-dev \ libpaho-mqtt-dev \ libpcap-dev \ - libssh-gcrypt-dev \ + libgcrypt-dev \ + libssh-dev \ libbsd-dev \ libgnutls30 \ libgssapi3-heimdal \ From a41f006c9bb0de4ac80653a028306e61d03babec Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 27 Sep 2024 12:02:04 +0200 Subject: [PATCH 03/17] Fix: Add -L option to curl invocations, to follow redirects. --- rust/cross.Dockerfile | 4 ++-- rust/cross_aarch64.Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/cross.Dockerfile b/rust/cross.Dockerfile index a8e66bb99..666852ba2 100644 --- a/rust/cross.Dockerfile +++ b/rust/cross.Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y \ flex \ curl \ zlib1g-dev -RUN curl -o /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz +RUN curl -L -o /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz WORKDIR /tmp RUN tar xvf pcap.tar.gz RUN ls -las @@ -24,7 +24,7 @@ RUN ./configure RUN make install RUN ldconfig -RUN curl -o /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz +RUN curl -L -o /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz WORKDIR /tmp RUN tar xvf openssl.tar.gz RUN ls -las diff --git a/rust/cross_aarch64.Dockerfile b/rust/cross_aarch64.Dockerfile index 26dafa4db..6403a0145 100644 --- a/rust/cross_aarch64.Dockerfile +++ b/rust/cross_aarch64.Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \ flex \ curl \ zlib1g-dev -RUN curl -o /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz +RUN curl -L -o /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz ENV CC=aarch64-linux-gnu-gcc ENV CFLAGS='-Os' ENV CHOST=arm64 @@ -29,7 +29,7 @@ RUN ./configure RUN make install RUN ldconfig -RUN curl -o /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz +RUN curl -L -o /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz WORKDIR /tmp RUN tar xvf openssl.tar.gz RUN ls -las From 144431ee99898f315662d8953fb5b31752e0cbd7 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 09:18:29 +0200 Subject: [PATCH 04/17] Fix: Decrypt typo --- rust/data/nasl_syntax/smb_nt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/data/nasl_syntax/smb_nt.inc b/rust/data/nasl_syntax/smb_nt.inc index 90c8495c8..3e0656ee4 100644 --- a/rust/data/nasl_syntax/smb_nt.inc +++ b/rust/data/nasl_syntax/smb_nt.inc @@ -339,7 +339,7 @@ function smb_recv( socket ) { if( strlen( trailer ) < len ) return NULL; # Verify that the transform header signature is correct - # Decrpyt the encryption data and craft a packet with the correct length but without the transform header + # Decrypt the encryption data and craft a packet with the correct length but without the transform header # We delete the transform header after this step because else we would need to restructure every other function # These checks are in accordance with [MS-SMB2 3.3.5.2.1.1] # We should only decrypt the received packages that are encrypted of course From a0e2b06024fa0851c8cd5e07a4c9d8f7d80b5164 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 09:39:12 +0200 Subject: [PATCH 05/17] Fix: Try cargo update --- rust/Cargo.lock | 344 +++++++++++++++++++++++------------------------- 1 file changed, 165 insertions(+), 179 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b7b300353..d5b3e80d9 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "ascii-canvas" @@ -143,18 +143,27 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" dependencies = [ - "term", + "term 0.7.0", +] + +[[package]] +name = "ascii-canvas" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891" +dependencies = [ + "term 1.0.0", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -165,15 +174,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" +checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -183,9 +192,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5055edc4a9a1b2a917a818258cdfb86a535947feebd9981adc99667a062c6f85" +checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" dependencies = [ "bindgen", "cc", @@ -248,7 +257,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.77", + "syn 2.0.79", "which", ] @@ -263,11 +272,11 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ - "bit-vec 0.7.0", + "bit-vec 0.8.0", ] [[package]] @@ -278,9 +287,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bit-vec" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" @@ -336,9 +345,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "capnp" @@ -384,9 +393,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "jobserver", "libc", @@ -495,9 +504,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -505,9 +514,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", @@ -517,14 +526,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -819,7 +828,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -921,9 +930,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1031,7 +1040,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1168,9 +1177,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "heck" @@ -1272,9 +1281,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1352,7 +1361,7 @@ dependencies = [ "hyper 1.4.1", "hyper-util", "log", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -1362,9 +1371,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -1375,16 +1384,15 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1518,7 +1526,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1545,9 +1553,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", "hashbrown", @@ -1565,9 +1573,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "ipnetwork" @@ -1670,16 +1678,16 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ - "ascii-canvas", + "ascii-canvas 3.0.0", "bit-set 0.5.3", "ena", "itertools 0.11.0", "lalrpop-util 0.20.2", "petgraph", "regex", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "string_cache", - "term", + "term 0.7.0", "tiny-keccak", "unicode-xid", "walkdir", @@ -1687,21 +1695,21 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e56f323e2d610628d1f5bdd39168a774674ac7989ed67011963bb3f71edd797" +checksum = "06093b57658c723a21da679530e061a8c25340fa5a6f98e313b542268c7e2a1f" dependencies = [ - "ascii-canvas", - "bit-set 0.6.0", + "ascii-canvas 4.0.0", + "bit-set 0.8.0", "ena", "itertools 0.13.0", - "lalrpop-util 0.21.0", + "lalrpop-util 0.22.0", "petgraph", "regex", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "sha3", "string_cache", - "term", + "term 1.0.0", "unicode-xid", "walkdir", ] @@ -1712,16 +1720,17 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.7", + "regex-automata 0.4.8", ] [[package]] name = "lalrpop-util" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108dc8f5dabad92c65a03523055577d847f5dcc00f3e7d3a68bc4d48e01d8fe1" +checksum = "feee752d43abd0f4807a921958ab4131f692a44d4d599733d4419c5d586176ce" dependencies = [ - "regex-automata 0.4.7", + "regex-automata 0.4.8", + "rustversion", ] [[package]] @@ -1744,7 +1753,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1761,9 +1770,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libgcrypt-sys" @@ -1965,7 +1974,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2045,9 +2054,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "oorandom" @@ -2084,7 +2096,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2221,26 +2233,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2282,9 +2274,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plotters" @@ -2417,6 +2409,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "powerfmt" version = "0.2.0" @@ -2445,7 +2443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2542,9 +2540,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -2562,14 +2560,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -2583,13 +2581,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -2600,9 +2598,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -2683,9 +2681,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.36" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno 0.3.9", @@ -2708,15 +2706,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "aws-lc-rs", "log", "once_cell", "rustls-pki-types", - "rustls-webpki 0.102.7", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -2728,7 +2726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -2745,19 +2743,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -2771,9 +2768,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "aws-lc-rs", "ring", @@ -2872,9 +2869,9 @@ dependencies = [ "redis", "regex", "ripemd", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pemfile 1.0.4", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "sequoia-ipc", "sequoia-openpgp", "serde", @@ -2947,9 +2944,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -2969,8 +2966,8 @@ dependencies = [ "dirs", "fs2", "futures", - "lalrpop 0.21.0", - "lalrpop-util 0.21.0", + "lalrpop 0.22.0", + "lalrpop-util 0.22.0", "lazy_static", "libc", "memsec", @@ -3006,7 +3003,7 @@ dependencies = [ "openssl", "openssl-sys", "regex", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "sha1collisiondetection", "thiserror", "xxhash-rust", @@ -3029,7 +3026,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3046,9 +3043,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3252,9 +3249,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3275,7 +3272,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3316,9 +3313,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3338,24 +3335,34 @@ dependencies = [ "winapi", ] +[[package]] +name = "term" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4175de05129f31b80458c6df371a15e7fc3fd367272e6bf938e5c351c7ea0" +dependencies = [ + "home", + "windows-sys 0.52.0", +] + [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3468,7 +3475,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3487,7 +3494,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] @@ -3529,9 +3536,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -3540,27 +3547,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -3586,7 +3572,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3646,7 +3632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3663,30 +3649,30 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" @@ -3815,7 +3801,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -3849,7 +3835,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4131,9 +4117,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -4186,7 +4172,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -4208,7 +4194,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4228,7 +4214,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -4257,5 +4243,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] From 108d50cbdb577ab8ebba51d2dfdeb8ffe7ae6206 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 10:00:19 +0200 Subject: [PATCH 06/17] Fix: Add pull-request write permission to dependency-review workflow --- .github/workflows/dependency-review.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 36afcc325..d4be39743 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -3,6 +3,7 @@ on: [pull_request] permissions: contents: read + pull-requests: write jobs: dependency-review: From a4b2facd95b914eafdd81228cb46625391645ccb Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 10:18:28 +0200 Subject: [PATCH 07/17] Fix: Add libssl-dev to install-openvas-dependencies.sh --- .github/install-openvas-dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/install-openvas-dependencies.sh b/.github/install-openvas-dependencies.sh index cae315057..763a18cb1 100755 --- a/.github/install-openvas-dependencies.sh +++ b/.github/install-openvas-dependencies.sh @@ -20,6 +20,7 @@ apt-get update && apt-get install --no-install-recommends --no-install-suggests libpcap-dev \ libgcrypt-dev \ libssh-dev \ + libssl-dev \ libbsd-dev \ libgnutls30 \ libgssapi3-heimdal \ From 6b157fbf82c4ac957f938bd3ac0b680ca1a36c1c Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 10:54:38 +0200 Subject: [PATCH 08/17] Fix: Try libssl1.1 instead of libssl-dev --- .github/install-openvas-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/install-openvas-dependencies.sh b/.github/install-openvas-dependencies.sh index 763a18cb1..471650575 100755 --- a/.github/install-openvas-dependencies.sh +++ b/.github/install-openvas-dependencies.sh @@ -20,7 +20,7 @@ apt-get update && apt-get install --no-install-recommends --no-install-suggests libpcap-dev \ libgcrypt-dev \ libssh-dev \ - libssl-dev \ + libssl1.1 \ libbsd-dev \ libgnutls30 \ libgssapi3-heimdal \ From 3cf76c0ab7ebc4fe60dc6d58f7c1beaac0c71475 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 10:56:35 +0200 Subject: [PATCH 09/17] Fix: Remove libssl from install-openvas-dependencies --- .github/install-openvas-dependencies.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/install-openvas-dependencies.sh b/.github/install-openvas-dependencies.sh index 471650575..cae315057 100755 --- a/.github/install-openvas-dependencies.sh +++ b/.github/install-openvas-dependencies.sh @@ -20,7 +20,6 @@ apt-get update && apt-get install --no-install-recommends --no-install-suggests libpcap-dev \ libgcrypt-dev \ libssh-dev \ - libssl1.1 \ libbsd-dev \ libgnutls30 \ libgssapi3-heimdal \ From d16140fd76b0b959685c1a2f10bb9c422d4ef0dd Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 11:07:12 +0200 Subject: [PATCH 10/17] Fix: Add openssl directly to dependencies instead of libssl --- .github/install-openvas-dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/install-openvas-dependencies.sh b/.github/install-openvas-dependencies.sh index cae315057..286bf5033 100755 --- a/.github/install-openvas-dependencies.sh +++ b/.github/install-openvas-dependencies.sh @@ -12,6 +12,7 @@ apt-get update && apt-get install --no-install-recommends --no-install-suggests curl \ git \ lcov \ + openssl \ libgnutls28-dev \ libgpgme-dev \ libjson-glib-dev \ From e3a597fe244885015fe12e1723235fa143b4e80c Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 11:26:36 +0200 Subject: [PATCH 11/17] Fix: Install openssl as mentioned in openssl crate documentation: Link: https://docs.rs/openssl/0.10.66/openssl/ --- .github/install-openvas-dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/install-openvas-dependencies.sh b/.github/install-openvas-dependencies.sh index 286bf5033..d4c7402e1 100755 --- a/.github/install-openvas-dependencies.sh +++ b/.github/install-openvas-dependencies.sh @@ -12,7 +12,8 @@ apt-get update && apt-get install --no-install-recommends --no-install-suggests curl \ git \ lcov \ - openssl \ + pkg-config \ + libssl-dev \ libgnutls28-dev \ libgpgme-dev \ libjson-glib-dev \ From 2d11ce2090a4789f45946bd0f94839a854c0ca58 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 13:45:32 +0200 Subject: [PATCH 12/17] Fix: Add openssl crate --- rust/Cargo.lock | 1 + rust/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index d5b3e80d9..f35bbcdd7 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2856,6 +2856,7 @@ dependencies = [ "nasl-c-lib", "nasl-function-proc-macro", "num_cpus", + "openssl", "pbkdf2", "pcap", "pkcs8", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 2aa8b410b..c20beec1e 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -85,6 +85,7 @@ libssh-rs = {version = "~0.2", features = ["vendored-openssl", "vendored"], opti nasl-function-proc-macro = { path = "crates/nasl-function-proc-macro" } nasl-c-lib = { path = "crates/nasl-c-lib", optional = true } +openssl = "0.10.66" [workspace] resolver = "2" From a1eeb0e78c1d85def65cde35836e76f62ef5f562 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Fri, 4 Oct 2024 14:51:46 +0200 Subject: [PATCH 13/17] Fix: Add openssl as vendored to Cargo.toml --- rust/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/Cargo.toml b/rust/Cargo.toml index c20beec1e..4241cdb32 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -85,7 +85,7 @@ libssh-rs = {version = "~0.2", features = ["vendored-openssl", "vendored"], opti nasl-function-proc-macro = { path = "crates/nasl-function-proc-macro" } nasl-c-lib = { path = "crates/nasl-c-lib", optional = true } -openssl = "0.10.66" +openssl = { version = "0.10.66", features = ["vendored"] } [workspace] resolver = "2" From ace0b79a626fd955299882a6abeba697d3326c98 Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Tue, 8 Oct 2024 11:34:28 +0200 Subject: [PATCH 14/17] Update cross.Dockerfile change curl flags --- rust/cross.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/cross.Dockerfile b/rust/cross.Dockerfile index 666852ba2..530b48ff2 100644 --- a/rust/cross.Dockerfile +++ b/rust/cross.Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y \ flex \ curl \ zlib1g-dev -RUN curl -L -o /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz +RUN curl -Lfo /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz WORKDIR /tmp RUN tar xvf pcap.tar.gz RUN ls -las @@ -18,13 +18,13 @@ RUN cat config.log RUN make install RUN mkdir /tmp/zlib -RUN curl -sf -L https://www.zlib.net/current/zlib.tar.gz | tar zxvf - --strip-components=1 -C /tmp/zlib +RUN curl -Lsfo https://www.zlib.net/current/zlib.tar.gz | tar zxvf - --strip-components=1 -C /tmp/zlib WORKDIR /tmp/zlib RUN ./configure RUN make install RUN ldconfig -RUN curl -L -o /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz +RUN curl -Lfo /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz WORKDIR /tmp RUN tar xvf openssl.tar.gz RUN ls -las From 0ce42c0c89791e13de5fc7526a540cb5d7be838e Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Tue, 8 Oct 2024 11:47:32 +0200 Subject: [PATCH 15/17] Switch back to functioning flags for zlib --- rust/cross.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/cross.Dockerfile b/rust/cross.Dockerfile index 530b48ff2..df96365c8 100644 --- a/rust/cross.Dockerfile +++ b/rust/cross.Dockerfile @@ -18,7 +18,7 @@ RUN cat config.log RUN make install RUN mkdir /tmp/zlib -RUN curl -Lsfo https://www.zlib.net/current/zlib.tar.gz | tar zxvf - --strip-components=1 -C /tmp/zlib +RUN curl -sf -L https://www.zlib.net/current/zlib.tar.gz | tar zxvf - --strip-components=1 -C /tmp/zlib WORKDIR /tmp/zlib RUN ./configure RUN make install From 60c803fe7a839f9def18d4255c43fee7751c83c2 Mon Sep 17 00:00:00 2001 From: robert-schardt Date: Tue, 8 Oct 2024 14:26:12 +0200 Subject: [PATCH 16/17] Update cross_aarch64.Dockerfile --- rust/cross_aarch64.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/cross_aarch64.Dockerfile b/rust/cross_aarch64.Dockerfile index 6403a0145..74929c2ba 100644 --- a/rust/cross_aarch64.Dockerfile +++ b/rust/cross_aarch64.Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \ flex \ curl \ zlib1g-dev -RUN curl -L -o /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz +RUN curl -Lfo /tmp/pcap.tar.gz https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz ENV CC=aarch64-linux-gnu-gcc ENV CFLAGS='-Os' ENV CHOST=arm64 @@ -29,7 +29,7 @@ RUN ./configure RUN make install RUN ldconfig -RUN curl -L -o /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz +RUN curl -Lfo /tmp/openssl.tar.gz https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz WORKDIR /tmp RUN tar xvf openssl.tar.gz RUN ls -las From 5f874bba4bfb4294254e247acc790652228f3f2e Mon Sep 17 00:00:00 2001 From: Robert Schardt Date: Tue, 8 Oct 2024 15:04:30 +0200 Subject: [PATCH 17/17] Add libgcrypt to testing and libcjson to oldstable dockerfiles --- .docker/prod-oldstable.Dockerfile | 1 + .docker/prod-testing.Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.docker/prod-oldstable.Dockerfile b/.docker/prod-oldstable.Dockerfile index 39f8130bf..82dd38989 100644 --- a/.docker/prod-oldstable.Dockerfile +++ b/.docker/prod-oldstable.Dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge cmake \ curl \ lcov \ + libcjson1 \ libgnutls28-dev \ libgpgme-dev \ libjson-glib-dev \ diff --git a/.docker/prod-testing.Dockerfile b/.docker/prod-testing.Dockerfile index ea214ebc2..0c83dc46e 100644 --- a/.docker/prod-testing.Dockerfile +++ b/.docker/prod-testing.Dockerfile @@ -23,6 +23,7 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge libksba-dev \ libpaho-mqtt-dev \ libpcap-dev \ + libgcrypt-dev \ libssh-dev \ libbsd-dev \ libgnutls30t64 \