Merge e17826c into bfb3e93

mkaring · web-flow · commit 14ccabcf6c9c · 2020-12-21T15:17:58.000Z
diff --git a/Confuser.Renamer/AnalyzePhase.cs b/Confuser.Renamer/AnalyzePhase.cs
@@ -176,7 +176,7 @@ void Analyze(NameService service, ConfuserContext context, ProtectionParameters
 				return;
 
 			if (type.InheritsFromCorlib("System.Attribute")) {
-				service.ReduceRenameMode(type, RenameMode.ASCII);
+				service.ReduceRenameMode(type, RenameMode.Reflection);
 			}
 
 			if (type.InheritsFrom("System.Configuration.SettingsBase")) {
diff --git a/Confuser.Renamer/Analyzers/ResourceAnalyzer.cs b/Confuser.Renamer/Analyzers/ResourceAnalyzer.cs
@@ -38,7 +38,7 @@ public void Analyze(ConfuserContext context, INameService service, ProtectionPar
 						context.Logger.WarnFormat(Resources.ResourceAnalyzer_Analyze_CouldNotFindResourceType, typeName);
 						continue;
 					}
-					service.ReduceRenameMode(type, RenameMode.ASCII);
+					service.ReduceRenameMode(type, RenameMode.Reflection);
 					service.AddReference(type, new ResourceReference(res, type, format));
 				}
 			}
@@ -69,7 +69,7 @@ public void Analyze(ConfuserContext context, INameService service, ProtectionPar
 						context.Logger.WarnFormat(Resources.ResourceAnalyzer_Analyze_CouldNotFindResourceType, typeName);
 						continue;
 					}
-					service.ReduceRenameMode(type, RenameMode.ASCII);
+					service.ReduceRenameMode(type, RenameMode.Reflection);
 					service.AddReference(type, new ResourceReference(res, type, format));
 
 					if (mismatchingName)
diff --git a/Confuser.Renamer/Analyzers/TypeBlobAnalyzer.cs b/Confuser.Renamer/Analyzers/TypeBlobAnalyzer.cs
@@ -134,7 +134,7 @@ private static void AnalyzeCAArgument(ICollection<ModuleDefMD> modules, INameSer
 					if (modules.Contains((ModuleDefMD)typeDef.Module)) {
 						if (typeRef is TypeRef)
 							service.AddReference(typeDef, new TypeRefReference((TypeRef)typeRef, typeDef));
-						service.ReduceRenameMode(typeDef, RenameMode.ASCII);
+						service.ReduceRenameMode(typeDef, RenameMode.Reflection);
 					}
 				}
 			}
diff --git a/Confuser.Renamer/NameService.cs b/Confuser.Renamer/NameService.cs
@@ -179,6 +179,8 @@ string ObfuscateNameInternal(byte[] hash, RenameMode mode) {
 					return Utils.EncodeString(hash, letterCharset);
 				case RenameMode.ASCII:
 					return Utils.EncodeString(hash, asciiCharset);
+				case RenameMode.Reflection:
+					return Utils.EncodeString(hash, reflectionCharset);
 				case RenameMode.Decodable:
 					IncrementNameId();
 					return "_" + Utils.EncodeString(hash, alphaNumCharset);
@@ -311,6 +313,8 @@ public void MarkHelper(IDnlibDef def, IMarkerService marker, ConfuserComponent p
 		                                                .Except(new[] { '.' })
 		                                                .ToArray();
 
+		static readonly char[] reflectionCharset = asciiCharset.Except(new[] { ' ', '[', ']' }).ToArray();
+
 		static readonly char[] letterCharset = Enumerable.Range(0, 26)
 		                                                 .SelectMany(ord => new[] { (char)('a' + ord), (char)('A' + ord) })
 		                                                 .ToArray();
diff --git a/Confuser.Renamer/RenameMode.cs b/Confuser.Renamer/RenameMode.cs
@@ -4,8 +4,14 @@ namespace Confuser.Renamer {
 	public enum RenameMode {
 		Empty = 0x0,
 		Unicode = 0x1,
+		// ReSharper disable once InconsistentNaming
 		ASCII = 0x2,
-		Letters = 0x3,
+		/// <summary>
+		/// This the the rename mode with the largest set of possible characters,
+		/// that is still save for reflection.
+		/// </summary>
+		Reflection = 0x3,
+		Letters = 0x4,
 
 		Decodable = 0x10,
 		Sequential = 0x11,

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ void Analyze(NameService service, ConfuserContext context, ProtectionParameters`
`176`	`176`	`return;`
`177`	`177`
`178`	`178`	`if (type.InheritsFromCorlib("System.Attribute")) {`
`179`		`- service.ReduceRenameMode(type, RenameMode.ASCII);`
	`179`	`+ service.ReduceRenameMode(type, RenameMode.Reflection);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`if (type.InheritsFrom("System.Configuration.SettingsBase")) {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void Analyze(ConfuserContext context, INameService service, ProtectionPar`
`38`	`38`	`context.Logger.WarnFormat(Resources.ResourceAnalyzer_Analyze_CouldNotFindResourceType, typeName);`
`39`	`39`	`continue;`
`40`	`40`	`}`
`41`		`- service.ReduceRenameMode(type, RenameMode.ASCII);`
	`41`	`+ service.ReduceRenameMode(type, RenameMode.Reflection);`
`42`	`42`	`service.AddReference(type, new ResourceReference(res, type, format));`
`43`	`43`	`}`
`44`	`44`	`}`
`@@ -69,7 +69,7 @@ public void Analyze(ConfuserContext context, INameService service, ProtectionPar`
`69`	`69`	`context.Logger.WarnFormat(Resources.ResourceAnalyzer_Analyze_CouldNotFindResourceType, typeName);`
`70`	`70`	`continue;`
`71`	`71`	`}`
`72`		`- service.ReduceRenameMode(type, RenameMode.ASCII);`
	`72`	`+ service.ReduceRenameMode(type, RenameMode.Reflection);`
`73`	`73`	`service.AddReference(type, new ResourceReference(res, type, format));`
`74`	`74`
`75`	`75`	`if (mismatchingName)`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private static void AnalyzeCAArgument(ICollection<ModuleDefMD> modules, INameSer`
`134`	`134`	`if (modules.Contains((ModuleDefMD)typeDef.Module)) {`
`135`	`135`	`if (typeRef is TypeRef)`
`136`	`136`	`service.AddReference(typeDef, new TypeRefReference((TypeRef)typeRef, typeDef));`
`137`		`- service.ReduceRenameMode(typeDef, RenameMode.ASCII);`
	`137`	`+ service.ReduceRenameMode(typeDef, RenameMode.Reflection);`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`