Skip to content

Commit 4cda7ba

Browse files
iainnicoliainnicol
committed
Upgrade to .NET Framework v4.0
This is mainly from v2.0. This gives a couple opportunities for clearer code. This essentially fixes <haf#94>. There could be similar work done in the future to drop the PCL libraries and #ifdefs. The new .NET Standard support (for .NET Core) obsoletes PCLs for most practical purposes. Besides .NET Framework v2.0 being ancient, we have another reason to upgrade. We will shortly create NuGet packages targetting .NET Standard. Albacore is used to generate NuGet packages. v3 of Albacore, which we will need to use, recognises that TargetFramework v4.0 requires a folder called <lib/net40> in the NuGet package. However, Albacore v3 does not accordingly recognise TargetFramework v2.0.
1 parent 6b61146 commit 4cda7ba

File tree

29 files changed

+58
-118
lines changed

29 files changed

+58
-118
lines changed

‎README.md

+4-18
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,7 @@ Pre-requisites to run Applications that use DotNetZip
365365
-----------------------------------------------------
366366

367367
To run desktop applications that depend on DotNetZip:
368-
.NET Framework 2.0 or later
369-
370-
371-
To run smart device applications that depend on DotNetZip:
372-
.NET Compact Framework 2.0 or later
368+
.NET Framework 4.0 or later
373369

374370

375371

@@ -798,22 +794,12 @@ You can get it here:
798794
Building DotNetZip with the .NET SDK
799795
-------------------------------------
800796

801-
To build the library using the .NET Framework SDK v3.5,
797+
To build the library using the .NET Framework SDK v4.0,
802798

803799
1. extract the contents of the source zip into a new directory.
804800

805-
2. be sure the .NET 2.0 SDK, .NET 3.5 runtime, and .NET 2.0 runtime
806-
directories are on your path. These are typically
807-
808-
C:\Program Files\Microsoft.NET\SDK\v2.0\bin
809-
c:\windows\Microsoft.NET\Framework\v3.5
810-
and
811-
c:\WINDOWS\Microsoft.NET\Framework\v2.0.50727
812-
813-
The .NET 3.5 runtime is necessary because building DotNetZip requires
814-
the csc.exe compiler from NET 3.5. (Using DotNetZip from within C#
815-
requires the v2.0 csc compiler.)
816-
801+
2. be sure the .NET 4.0 SDK and runtime directories are on your
802+
path.
817803

818804
3. Modify the .csproj files in Zip and ZLIB and BZip2 to eliminate
819805
mention of the Ionic.pfx and Ionic.snk files.

‎Rakefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ directory 'build/pkg'
3434
#I'm sorry
3535

3636
desc "Pack the standard Zip library"
37-
nugets_pack 'create_nuget_net20' => ['build/pkg', :versioning, :build] do |p|
38-
p.target = 'net20'
37+
nugets_pack 'create_nuget_netfx' => ['build/pkg', :versioning, :build] do |p|
38+
p.target = 'net40'
3939
p.configuration = 'Release'
4040
p.files = FileList['src/Zip/*.csproj']
4141
p.out = 'build/pkg'
@@ -110,7 +110,7 @@ nugets_pack 'create_nuget_Xamarin.iOS10' => ['build/pkg', :versioning, :build] d
110110
end
111111

112112
task :default do
113-
%w|net20 MonoAndroid10 Xamarin.iOS10|.each do |fw|
113+
%w|netfx MonoAndroid10 Xamarin.iOS10|.each do |fw|
114114
Rake::Task["create_nuget_#{fw}"].invoke
115115
end
116116
end

‎src/BZip2/BZip2 DLL.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</SccAuxPath>
3737
<SccProvider>
3838
</SccProvider>
39-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
39+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
4040
<PublishUrl>publish\</PublishUrl>
4141
<Install>true</Install>
4242
<InstallFrom>Disk</InstallFrom>

‎src/Examples/C#/CreateZip/CreateZip.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</SccAuxPath>
2424
<SccProvider>
2525
</SccProvider>
26-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
26+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2727
<PublishUrl>publish\</PublishUrl>
2828
<Install>true</Install>
2929
<InstallFrom>Disk</InstallFrom>

‎src/Examples/C#/ReadZip/ReadZip.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</SccAuxPath>
2424
<SccProvider>
2525
</SccProvider>
26-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
26+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2727
<PublishUrl>publish\</PublishUrl>
2828
<Install>true</Install>
2929
<InstallFrom>Disk</InstallFrom>

‎src/Examples/C#/ZipDir/ZipDir.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</SccAuxPath>
2424
<SccProvider>
2525
</SccProvider>
26-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
26+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2727
<PublishUrl>publish\</PublishUrl>
2828
<Install>true</Install>
2929
<InstallFrom>Disk</InstallFrom>

‎src/Examples/C#/ZipTreeView/ZipTreeView.csproj

+4-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ZipTreeView</RootNamespace>
1212
<AssemblyName>ZipTreeView</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>
@@ -59,15 +59,9 @@
5959
</PropertyGroup>
6060
<ItemGroup>
6161
<Reference Include="System" />
62-
<Reference Include="System.Core">
63-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
64-
</Reference>
65-
<Reference Include="System.Xml.Linq">
66-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
67-
</Reference>
68-
<Reference Include="System.Data.DataSetExtensions">
69-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
70-
</Reference>
62+
<Reference Include="System.Core" />
63+
<Reference Include="System.Xml.Linq" />
64+
<Reference Include="System.Data.DataSetExtensions" />
7165
<Reference Include="System.Drawing" />
7266
<Reference Include="System.Windows.Forms" />
7367
</ItemGroup>

‎src/Examples/VB/Quick-Unzip/QuickUnzip.vbproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>QuickUnzip</AssemblyName>
1313
<FileAlignment>512</FileAlignment>
1414
<MyType>WindowsForms</MyType>
15-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1616
<OptionExplicit>On</OptionExplicit>
1717
<OptionCompare>Binary</OptionCompare>
1818
<OptionStrict>Off</OptionStrict>

‎src/Examples/VB/WinForms-DotNetZip/WinForms-Unzip/WinForms-Unzip.vbproj

+4-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>WinForms-Unzip</AssemblyName>
1313
<FileAlignment>512</FileAlignment>
1414
<MyType>WindowsForms</MyType>
15-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1616
<OptionExplicit>On</OptionExplicit>
1717
<OptionCompare>Binary</OptionCompare>
1818
<OptionStrict>Off</OptionStrict>
@@ -49,15 +49,9 @@
4949
<Reference Include="System.Drawing" />
5050
<Reference Include="System.Windows.Forms" />
5151
<Reference Include="System.Xml" />
52-
<Reference Include="System.Core">
53-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
54-
</Reference>
55-
<Reference Include="System.Xml.Linq">
56-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
57-
</Reference>
58-
<Reference Include="System.Data.DataSetExtensions">
59-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
60-
</Reference>
52+
<Reference Include="System.Core" />
53+
<Reference Include="System.Xml.Linq" />
54+
<Reference Include="System.Data.DataSetExtensions" />
6155
</ItemGroup>
6256
<ItemGroup>
6357
<Import Include="Microsoft.VisualBasic" />

‎src/Examples/VB/WinForms-DotNetZip/WinForms-ZipUp/WinForms-ZipUp.vbproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>WindowsApplication1</AssemblyName>
1313
<FileAlignment>512</FileAlignment>
1414
<MyType>WindowsForms</MyType>
15-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1616
<OptionExplicit>On</OptionExplicit>
1717
<OptionCompare>Binary</OptionCompare>
1818
<OptionStrict>Off</OptionStrict>

‎src/Examples/VB/WinForms-TreeViewZip/WinForms-TreeViewZip/WinForms-TreeViewZip.vbproj

+4-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>WinForms-TreeViewZip</AssemblyName>
1313
<FileAlignment>512</FileAlignment>
1414
<MyType>WindowsForms</MyType>
15-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1616
<OptionExplicit>On</OptionExplicit>
1717
<OptionCompare>Binary</OptionCompare>
1818
<OptionStrict>Off</OptionStrict>
@@ -70,15 +70,9 @@
7070
<Reference Include="System.Drawing" />
7171
<Reference Include="System.Windows.Forms" />
7272
<Reference Include="System.Xml" />
73-
<Reference Include="System.Core">
74-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
75-
</Reference>
76-
<Reference Include="System.Xml.Linq">
77-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
78-
</Reference>
79-
<Reference Include="System.Data.DataSetExtensions">
80-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
81-
</Reference>
73+
<Reference Include="System.Core" />
74+
<Reference Include="System.Xml.Linq" />
75+
<Reference Include="System.Data.DataSetExtensions" />
8276
</ItemGroup>
8377
<ItemGroup>
8478
<Import Include="Microsoft.VisualBasic" />

‎src/Help/Introduction/About.htm

+4-11
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ <h2>Frequently Asked Questions </h2>
116116

117117

118118
<p><b>What do I need, in order to be able to create and read zip files from within my application using this library?</b><br/>
119-
To use the zip capability in your applications, you need to be using the .NET Framework 2.0 or later, and you need the DotNetZip assembly. You can use the Zip library from any application, whether a console application, a Windows-Forms application, a server-based application like an ASP.NET page, or something else. You can use C#, VB.NET, COBOL.NET, IronPython, IronRuby, F#, or any other .NET language. </p>
119+
To use the zip capability in your applications, you need to be using the .NET Framework 4.0 or later, and you need the DotNetZip assembly. You can use the Zip library from any application, whether a console application, a Windows-Forms application, a server-based application like an ASP.NET page, or something else. You can use C#, VB.NET, COBOL.NET, IronPython, IronRuby, F#, or any other .NET language. </p>
120120

121121
<p><b>What do I need to build this library from the source?</b><br/>
122122

123123
To use the zip capability in your applications, you need to be using the
124-
.NET Framework 2.0 or later, and you need the DotNetZip assembly. You
124+
.NET Framework 4.0 or later, and you need the DotNetZip assembly. You
125125
can use the Zip library from any application, whether a console
126126
application, a Windows-Forms application, a server-based application
127127
like an ASP.NET page, a smart-device app, a Windows Service, or
@@ -147,14 +147,7 @@ <h2>Frequently Asked Questions </h2>
147147

148148
<p><b>What do I need to _build_ this library from the source?f</b><br/>
149149

150-
You need the .NET Framework SDK v3.5, or later; or, Visual Studio 2008
151-
or later. While the library is usable by .NET 2.0 and later, to build
152-
it you need .NET 3.5 or later. This is because the source code uses
153-
features that were introduced in the C# v3.0 compiler, vars and array
154-
initializers and so on. The .NET 3.5 SDK is available
155-
<A href="http://www.microsoft.com/downloads/details.aspx?FamilyID=e6e1c3df-a74f-4207-8586-711ebe331cdc&DisplayLang=en">here</a>.
156-
I don&apos;t know if the library will _build_ in Visual C# Express 2008; I
157-
never tried it. It should.
150+
You need the .NET Framework SDK v4.0, or later.
158151

159152
</p>
160153

@@ -191,7 +184,7 @@ <h2>Frequently Asked Questions </h2>
191184

192185
Yes. It can make self-extracting zip files or standard zip files. The
193186
self-extracting archives can either be Windows (GUI) apps or
194-
command-line applications. The self-extractors require .NET 2.0 on the
187+
command-line applications. The self-extractors require .NET 4.0 on the
195188
computer doing the extraction. </p>
196189

197190

‎src/Tools/BZip2/BZip2.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</SccProvider>
2626
<SignAssembly>false</SignAssembly>
2727
<AssemblyOriginatorKeyFile>..\..\Ionic.snk</AssemblyOriginatorKeyFile>
28-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
28+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2929
<PublishUrl>publish\</PublishUrl>
3030
<Install>true</Install>
3131
<InstallFrom>Disk</InstallFrom>

‎src/Tools/ConvertZipToSfx/ConvertZipToSfx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// This is a command-line tool that creates a self-extracting Zip archive, given a
55
// standard zip archive.
6-
// It requires the .NET Framework 2.0 on the target machine in order to run.
6+
// It requires the .NET Framework 4.0 on the target machine in order to run.
77
//
88
//
99
// The Visual Studio Project is a little weird. There are code files that ARE NOT compiled

‎src/Tools/ConvertZipToSfx/ConvertZipToSfx.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Ionic.Utils.Zip</RootNamespace>
1212
<AssemblyName>ConvertZipToSfx</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<StartupObject>
1616
</StartupObject>

‎src/Tools/GZip/GZip.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</SccProvider>
2626
<SignAssembly>false</SignAssembly>
2727
<AssemblyOriginatorKeyFile>..\..\Ionic.snk</AssemblyOriginatorKeyFile>
28-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
28+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2929
<PublishUrl>publish\</PublishUrl>
3030
<Install>true</Install>
3131
<InstallFrom>Disk</InstallFrom>

‎src/Tools/UnZip/UnZip.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</SccProvider>
2626
<SignAssembly>false</SignAssembly>
2727
<AssemblyOriginatorKeyFile>..\..\Ionic.snk</AssemblyOriginatorKeyFile>
28-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
28+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2929
<PublishUrl>publish\</PublishUrl>
3030
<Install>true</Install>
3131
<InstallFrom>Disk</InstallFrom>

‎src/Tools/WinFormsApp/About.rtf

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ice .NET features like eventing and generic collections. There is a full helpfi
7878
\par DotNetZip is really nice to use with .NET apps, but it can also be used from Powershell scripts, as well as any COM-compliant
7979
language or environment. For example, you can write VBScript code that uses DotNetZip, to script the creation of AES-encrypted ZIP files.
8080
\par DotNetZip is CLS-compliant, FxCop-approved, fair-trade, color-blind, family-friendly, low-fat, and totally free of co
81-
st. The library can be used from any .NET programming language. This library runs on the .NET Framework. In particular, this tool runs only on the desktop Framework. DotNetZip requires .NET 2.0 at
81+
st. The library can be used from any .NET programming language. This library runs on the .NET Framework. In particular, this tool runs only on the desktop Framework. DotNetZip requires .NET 4.0 at
8282
a minimum.
8383
\par The library and this tool are produced in an open source project hosted at CodePlex: http://}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11567049\charrsid11567049 }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11567049 DotNetZip.codeplex.com/.
8484
\par DotNetZip is donationware. This tool and the library that supports it are free to use, but if you like the tool or library an

‎src/Tools/WinFormsApp/Win Forms App.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Ionic.Zip.Forms</RootNamespace>
1212
<AssemblyName>DotNetZip-WinFormsTool</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>
@@ -62,9 +62,7 @@
6262
</PropertyGroup>
6363
<ItemGroup>
6464
<Reference Include="System" />
65-
<Reference Include="System.Core">
66-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
67-
</Reference>
65+
<Reference Include="System.Core" />
6866
<Reference Include="System.Data" />
6967
<Reference Include="System.Deployment" />
7068
<Reference Include="System.Drawing" />

‎src/Tools/ZipIt/ZipIt.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</SccProvider>
2626
<SignAssembly>false</SignAssembly>
2727
<AssemblyOriginatorKeyFile>..\..\Ionic.snk</AssemblyOriginatorKeyFile>
28-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
28+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2929
<PublishUrl>publish\</PublishUrl>
3030
<Install>true</Install>
3131
<InstallFrom>Disk</InstallFrom>

‎src/Zip Full DLL/Zip Full DLL.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Ionic.Zip</RootNamespace>
1212
<AssemblyName>Ionic.Zip</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<StartupObject>
1616
</StartupObject>

‎src/Zip Reduced/Zip Reduced.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Zip_Reduced</RootNamespace>
1212
<AssemblyName>Ionic.Zip.Reduced</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<StartupObject>
1616
</StartupObject>

‎src/Zip Tests/Zip Tests.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@
7373
<HintPath>..\packages\Microsoft.VisualStudio.Zip.9.0.9.0\lib\Microsoft.VisualStudio.Zip.9.0.dll</HintPath>
7474
</Reference>
7575
<Reference Include="System" />
76-
<Reference Include="System.Core">
77-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
78-
</Reference>
76+
<Reference Include="System.Core" />
7977
<Reference Include="System.Windows.Forms" />
8078
<Reference Include="System.XML" />
8179
</ItemGroup>

‎src/Zip.Shared/Shared.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public static Int64 GetFileLength(string fileName)
7070
/// </para>
7171
/// <para>
7272
/// This is most nautrally an extension method for the DateTime class but this
73-
/// library is built for .NET 2.0, not for .NET 3.5; This means extension methods
74-
/// are a no-no.
73+
/// library used to be built for .NET 2.0; This meant extension methods were
74+
/// a no-no.
7575
/// </para>
7676
/// </remarks>
7777
/// <param name="source">The DateTime value to round</param>
@@ -576,7 +576,8 @@ public static string InternalGetTempFileName()
576576
/// </summary>
577577
/// <remarks>
578578
/// This could be gracefully handled with an extension attribute, but
579-
/// This assembly is built for .NET 2.0, so I cannot use them.
579+
/// This assembly used to be built for .NET 2.0, so could not use
580+
/// extension methods.
580581
/// </remarks>
581582
internal static int ReadWithRetry(System.IO.Stream s, byte[] buffer, int offset, int count, string FileName)
582583
{

‎src/Zip.Shared/WinZipAes.cs

+2-7
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,7 @@ internal class WinZipAesCipherStream : Stream
356356

357357
internal HMACSHA1 _mac;
358358

359-
// Use RijndaelManaged from .NET 2.0.
360-
// AesManaged came in .NET 3.5, but we want to limit
361-
// dependency to .NET 2.0. AES is just a restricted form
362-
// of Rijndael (fixed block size of 128, some crypto modes not supported).
363-
364-
internal RijndaelManaged _aesCipher;
359+
internal AesManaged _aesCipher;
365360
internal ICryptoTransform _xform;
366361

367362
private const int BLOCK_SIZE_IN_BYTES = 16;
@@ -433,7 +428,7 @@ internal WinZipAesCipherStream(System.IO.Stream s, WinZipAesCrypto cryptoParams,
433428

434429
_mac = new HMACSHA1(_params.MacIv);
435430

436-
_aesCipher = new System.Security.Cryptography.RijndaelManaged();
431+
_aesCipher = new System.Security.Cryptography.AesManaged();
437432
_aesCipher.BlockSize = 128;
438433
_aesCipher.KeySize = keySizeInBits; // 128, 192, 256
439434
_aesCipher.Mode = CipherMode.ECB;

0 commit comments

Comments
 (0)