Merge pull request #2 from greenozon/update_dnlib

Update dnlib to uptodate version 4.5.0

Author: meck-gd

De4DotCommon.props

@@ -14,8 +14,7 @@
     <Copyright>Copyright (C) 2011-2018 de4dot@gmail.com</Copyright>
     <OutputPath>$(MSBuildThisFileDirectory)\$(Configuration)</OutputPath>
     <DisableOutOfProcTaskHost>true</DisableOutOfProcTaskHost>
-
-    <DnlibVersion>3.6.0</DnlibVersion>
+    <DnlibVersion>4.5.0</DnlibVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SelfContained>true</SelfContained>

de4dot.blocks/de4dot.blocks.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.6.0" />
+    <PackageReference Include="dnlib" Version='$(DnlibVersion)' />
   </ItemGroup>
 
 </Project>

de4dot.code/deobfuscators/CodeVeil/ResourceConverter.cs

@@ -48,7 +48,7 @@ public ResourceConverter(ModuleDefMD module, ResourceInfo[] infos) {
 		}
 
 		public byte[] Convert() {
-			var resources = new ResourceElementSet();
+			var resources = ResourceElementSet.CreateForResourceReader(module);
 			foreach (var info in infos)
 				resources.Add(Convert(info));
 
@@ -145,7 +145,7 @@ ResourceElement Convert(ResourceInfo info) {
 				break;
 
 			case 31:	// binary
-				resourceData = dataCreator.CreateSerialized(reader.ReadBytes(info.length));
+				resourceData = dataCreator.CreateSerialized(reader.ReadBytes(info.length), SerializationFormat.BinaryFormatter, new UserResourceType("Binary", ResourceTypeCode.ByteArray));
 				break;
 
 			case 21:	// Point (CV doesn't restore this type)
@@ -166,7 +166,7 @@ class CharArrayResourceData : UserResourceData {
 		public CharArrayResourceData(UserResourceType type, char[] data) : base(type) => this.data = data;
 		#pragma warning disable SYSLIB0011
 		#warning "Insecure! Rewrite with custom parser https://learn.microsoft.com/en-us/dotnet/standard/serialization/binaryformatter-security-guide"
-		public override void WriteData(BinaryWriter writer, IFormatter formatter) => formatter.Serialize(writer.BaseStream, data);
+		public override void WriteData(ResourceBinaryWriter writer, IFormatter formatter) => formatter.Serialize(writer.BaseStream, data);
 		#pragma warning restore SYSLIB0011
 		public override string ToString() => $"char[]: Length: {data.Length}";
 	}
@@ -177,7 +177,7 @@ class IconResourceData : UserResourceData {
 		public IconResourceData(UserResourceType type, byte[] data) : base(type) => icon = new Icon(new MemoryStream(data));
 		#pragma warning disable SYSLIB0011
 		#warning "Insecure! Rewrite with custom parser https://learn.microsoft.com/en-us/dotnet/standard/serialization/binaryformatter-security-guide"
-		public override void WriteData(BinaryWriter writer, IFormatter formatter) => formatter.Serialize(writer.BaseStream, icon);
+		public override void WriteData(ResourceBinaryWriter writer, IFormatter formatter) => formatter.Serialize(writer.BaseStream, icon);
 		#pragma warning restore SYSLIB0011
 		public override string ToString() => $"Icon: {icon}";
 	}
@@ -188,7 +188,7 @@ class ImageResourceData : UserResourceData {
 		public ImageResourceData(UserResourceType type, byte[] data) : base(type) => bitmap = new Bitmap(Image.FromStream(new MemoryStream(data)));
 		#pragma warning disable SYSLIB0011
 		#warning "Insecure! Rewrite with custom parser https://learn.microsoft.com/en-us/dotnet/standard/serialization/binaryformatter-security-guide"
-		public override void WriteData(BinaryWriter writer, IFormatter formatter) => formatter.Serialize(writer.BaseStream, bitmap);
+		public override void WriteData(ResourceBinaryWriter writer, IFormatter formatter) => formatter.Serialize(writer.BaseStream, bitmap);
 		#pragma warning restore SYSLIB0011
 		public override string ToString() => "Bitmap";
 	}