starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-23 15:34:34 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Fix .NET Standard 2.0 build error - use compatible Rfc2898DeriveBytes constructor

Browse Source 
Co-authored-by: adamhathcock <527620+adamhathcock@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-10 20:21:01 +00:00
parent 68279e0a2b
commit 4910d6b567
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SharpCompress/Common/Zip/WinzipAesEncryptionStream.cs
View File

@@ -43,12 +43,7 @@ internal class WinzipAesEncryptionStream : Stream
var keyLength = GetKeyLength(keySize);
var derivedKeySize = (keyLength * 2) + 2;
#if NETFRAMEWORK
var rfc2898 = new Rfc2898DeriveBytes(password, salt, RFC2898_ITERATIONS);
var keyBytes = rfc2898.GetBytes(keyLength);
var ivBytes = rfc2898.GetBytes(keyLength);
var passwordVerifyValue = rfc2898.GetBytes(2);
#elif NET10_0_OR_GREATER
#if NET10_0_OR_GREATER
var passwordBytes = Encoding.UTF8.GetBytes(password);
var derivedKey = Rfc2898DeriveBytes.Pbkdf2(
passwordBytes,
@@ -60,7 +55,7 @@ internal class WinzipAesEncryptionStream : Stream
var keyBytes = derivedKey.AsSpan(0, keyLength).ToArray();
var ivBytes = derivedKey.AsSpan(keyLength, keyLength).ToArray();
var passwordVerifyValue = derivedKey.AsSpan(keyLength * 2, 2).ToArray();
#else
#elif NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
var rfc2898 = new Rfc2898DeriveBytes(
password,
salt,
@@ -70,6 +65,12 @@ internal class WinzipAesEncryptionStream : Stream
var keyBytes = rfc2898.GetBytes(keyLength);
var ivBytes = rfc2898.GetBytes(keyLength);
var passwordVerifyValue = rfc2898.GetBytes(2);
#else
// .NET Framework and .NET Standard 2.0 only support the 3-parameter constructor
var rfc2898 = new Rfc2898DeriveBytes(password, salt, RFC2898_ITERATIONS);
var keyBytes = rfc2898.GetBytes(keyLength);
var ivBytes = rfc2898.GetBytes(keyLength);
var passwordVerifyValue = rfc2898.GetBytes(2);
#endif
// Initialize cipher