From b943a14760b3a1b525f535847cfafeed60ed4319 Mon Sep 17 00:00:00 2001 From: mattosaurus Date: Mon, 13 Nov 2023 11:50:09 +0000 Subject: [PATCH 1/3] Don't dispose compressed ouitput stream --- PgpCore/PGP.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/PgpCore/PGP.cs b/PgpCore/PGP.cs index 403f6a6..27d1641 100644 --- a/PgpCore/PGP.cs +++ b/PgpCore/PGP.cs @@ -5010,13 +5010,12 @@ private async Task OutputSignedAsync(FileInfo inputFile, Stream outputStream) private async Task OutputSignedAsync(Stream inputStream, Stream outputStream, string name) { - using (Stream compressedOut = ChainCompressedOut(outputStream)) + Stream compressedOut = ChainCompressedOut(outputStream); + + PgpSignatureGenerator signatureGenerator = InitSignatureGenerator(compressedOut); + using (Stream literalOut = ChainLiteralStreamOut(compressedOut, inputStream, name)) { - PgpSignatureGenerator signatureGenerator = InitSignatureGenerator(compressedOut); - using (Stream literalOut = ChainLiteralStreamOut(compressedOut, inputStream, name)) - { - await WriteOutputAndSignAsync(compressedOut, literalOut, inputStream, signatureGenerator); - } + await WriteOutputAndSignAsync(compressedOut, literalOut, inputStream, signatureGenerator); } } From 386a7e58c7ba97b2da2ec23482b3a3ff5a47810e Mon Sep 17 00:00:00 2001 From: mattosaurus Date: Mon, 13 Nov 2023 11:52:23 +0000 Subject: [PATCH 2/3] Update properties --- PgpCore/PgpCore.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PgpCore/PgpCore.csproj b/PgpCore/PgpCore.csproj index 1c375d7..d557dc6 100644 --- a/PgpCore/PgpCore.csproj +++ b/PgpCore/PgpCore.csproj @@ -10,10 +10,10 @@ https://github.com/mattosaurus/PgpCore https://github.com/mattosaurus/PgpCore PGP .NET Core - 5.13.0.0 + 5.13.1.0 5.0.0.0 - 5.13.0 - v5.13.0 - Add prefered encryption key + 5.13.1 + v5.13.1 - Don't dispose compressed output stream MIT true true From 37828c925550d24deae708b48730565da61e06f4 Mon Sep 17 00:00:00 2001 From: mattosaurus Date: Mon, 13 Nov 2023 15:41:20 +0000 Subject: [PATCH 3/3] Update sonarqube java version --- .github/workflows/analyze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index 782411c..4657f2b 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -5,7 +5,7 @@ jobs: analyze: runs-on: windows-latest steps: - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: java-version: 11