Skip to content

[Java.Interop.Tools.JavaCallableWrappers] remove all usage of MD5 #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Oct 28, 2019
Merged

[Java.Interop.Tools.JavaCallableWrappers] remove all usage of MD5 #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/Crc64.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,11 @@ public class Crc64 : HashAlgorithm
ulong crc = ulong.MaxValue;
ulong length = 0;

public override void Initialize () { }
public override void Initialize ()
{
crc = ulong.MaxValue;
length = 0;
}

protected override void HashCore (byte [] array, int ibStart, int cbSize)
{
Expand Down
14 changes: 7 additions & 7 deletions ...rappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void GenerateIndirectApplication (
)
{
var actual = Generate (typeof (IndirectApplication), applicationJavaClass);
var expected = @"package md5f43cdfade412ae71b21bb70a5c2841ab;
var expected = @"package crc64197ae30a36756915;


public class IndirectApplication
Expand Down Expand Up @@ -153,7 +153,7 @@ public void monodroidClearReferences ()
public void GenerateExportedMembers ()
{
var actual = Generate (typeof (ExportsMembers));
var expected = @"package md5f43cdfade412ae71b21bb70a5c2841ab;
var expected = @"package crc64197ae30a36756915;


public class ExportsMembers
Expand All @@ -165,7 +165,7 @@ extends java.lang.Object
public static final String __md_methods;
static {
__md_methods =
""n_GetInstance:()Lmd5f43cdfade412ae71b21bb70a5c2841ab/ExportsMembers;:__export__\n"" +
""n_GetInstance:()Lcrc64197ae30a36756915/ExportsMembers;:__export__\n"" +
""n_GetValue:()Ljava/lang/String;:__export__\n"" +
""n_methodNamesNotMangled:()V:__export__\n"" +
""n_CompletelyDifferentName:(Ljava/lang/String;I)Ljava/lang/String;:__export__\n"" +
Expand All @@ -176,17 +176,17 @@ extends java.lang.Object
}


public static md5f43cdfade412ae71b21bb70a5c2841ab.ExportsMembers STATIC_INSTANCE = GetInstance ();
public static crc64197ae30a36756915.ExportsMembers STATIC_INSTANCE = GetInstance ();


public java.lang.String VALUE = GetValue ();

public static md5f43cdfade412ae71b21bb70a5c2841ab.ExportsMembers GetInstance ()
public static crc64197ae30a36756915.ExportsMembers GetInstance ()
{
return n_GetInstance ();
}

private static native md5f43cdfade412ae71b21bb70a5c2841ab.ExportsMembers n_GetInstance ();
private static native crc64197ae30a36756915.ExportsMembers n_GetInstance ();

public java.lang.String GetValue ()
{
Expand Down Expand Up @@ -249,7 +249,7 @@ public void monodroidClearReferences ()
public void GenerateInnerClass ()
{
var actual = Generate (typeof (ExampleOuterClass));
var expected = @"package md5f43cdfade412ae71b21bb70a5c2841ab;
var expected = @"package crc64197ae30a36756915;


public class ExampleOuterClass
Expand Down
7 changes: 0 additions & 7 deletions ...llableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ public void TearDown ()
JavaNativeTypeManager.PackageNamingPolicy = existingValue;
}

[Test]
public void MD5 ()
{
JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseMD5;
Assert.AreEqual ("md5acb69d261d9efeb0927dd7ff443b9a3a", JavaNativeTypeManager.GetPackageName (typeof (string)));
}

[Test]
public void Crc64 ()
{
Expand Down
32 changes: 16 additions & 16 deletions ...allableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
Expand Down Expand Up @@ -50,22 +50,22 @@ public void WriteJavaToManaged ()
v.WriteJavaToManaged (o);
var a = ToArray (o);
Save (a, "__j2m");
var length = 204;
var offset = 90;
var length = 190;
var offset = 76;
var e =
"version=1\u0000" +
$"entry-count={types.Count - 1}\u0000" +
"entry-len=" + length + "\u0000" +
"value-offset=" + offset + "\u0000" +
GetJ2MEntryLine (typeof (ActivityName), "activity/Name", offset, length) +
GetJ2MEntryLine (typeof (ApplicationName), "application/Name", offset, length) +
GetJ2MEntryLine (typeof (DefaultName), "crc64197ae30a36756915/DefaultName", offset, length) +
GetJ2MEntryLine (typeof (DefaultName.A), "crc64197ae30a36756915/DefaultName_A", offset, length) +
GetJ2MEntryLine (typeof (DefaultName.A.B), "crc64197ae30a36756915/DefaultName_A_B", offset, length) +
GetJ2MEntryLine (typeof (DefaultName.C.D), "crc64197ae30a36756915/DefaultName_C_D", offset, length) +
GetJ2MEntryLine (typeof (ExampleOuterClass), "crc64197ae30a36756915/ExampleOuterClass", offset, length) +
GetJ2MEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "crc64197ae30a36756915/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
GetJ2MEntryLine (typeof (InstrumentationName), "instrumentation/Name", offset, length) +
GetJ2MEntryLine (typeof (DefaultName), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName", offset, length) +
GetJ2MEntryLine (typeof (DefaultName.A), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A", offset, length) +
GetJ2MEntryLine (typeof (DefaultName.A.B), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A_B", offset, length) +
GetJ2MEntryLine (typeof (DefaultName.C.D), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_C_D", offset, length) +
GetJ2MEntryLine (typeof (ExampleOuterClass), "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass", offset, length) +
GetJ2MEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
GetJ2MEntryLine (typeof (AbstractClass), "my/AbstractClass", offset, length) +
GetJ2MEntryLine (typeof (ExampleActivity), "my/ExampleActivity", offset, length) +
GetJ2MEntryLine (typeof (ExampleInstrumentation), "my/ExampleInstrumentation", offset, length) +
Expand Down Expand Up @@ -128,7 +128,7 @@ public void WriteManagedToJava ()
v.WriteManagedToJava (o);
var a = ToArray (o);
Save (a, "__m2j");
var length = 204;
var length = 190;
var offset = 114;
var e =
"version=1\u0000" +
Expand All @@ -139,14 +139,14 @@ public void WriteManagedToJava ()
GetM2JEntryLine (typeof (AbstractClassInvoker), "my/AbstractClass", offset, length) +
GetM2JEntryLine (typeof (ActivityName), "activity/Name", offset, length) +
GetM2JEntryLine (typeof (ApplicationName), "application/Name", offset, length) +
GetM2JEntryLine (typeof (DefaultName.A.B), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A_B", offset, length) +
GetM2JEntryLine (typeof (DefaultName.A), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A", offset, length) +
GetM2JEntryLine (typeof (DefaultName.C.D), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_C_D", offset, length) +
GetM2JEntryLine (typeof (DefaultName), "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName", offset, length) +
GetM2JEntryLine (typeof (DefaultName.A.B), "crc64197ae30a36756915/DefaultName_A_B", offset, length) +
GetM2JEntryLine (typeof (DefaultName.A), "crc64197ae30a36756915/DefaultName_A", offset, length) +
GetM2JEntryLine (typeof (DefaultName.C.D), "crc64197ae30a36756915/DefaultName_C_D", offset, length) +
GetM2JEntryLine (typeof (DefaultName), "crc64197ae30a36756915/DefaultName", offset, length) +
GetM2JEntryLine (typeof (ExampleActivity), "my/ExampleActivity", offset, length) +
GetM2JEntryLine (typeof (ExampleInstrumentation), "my/ExampleInstrumentation", offset, length) +
GetM2JEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
GetM2JEntryLine (typeof (ExampleOuterClass), "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass", offset, length) +
GetM2JEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "crc64197ae30a36756915/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
GetM2JEntryLine (typeof (ExampleOuterClass), "crc64197ae30a36756915/ExampleOuterClass", offset, length) +
GetM2JEntryLine (typeof (InstrumentationName), "instrumentation/Name", offset, length) +
GetM2JEntryLine (typeof (NonStaticOuterClass.NonStaticInnerClass), "register/NonStaticOuterClass$NonStaticInnerClass", offset, length) +
GetM2JEntryLine (typeof (NonStaticOuterClass), "register/NonStaticOuterClass", offset, length) +
Expand Down
15 changes: 5 additions & 10 deletions ...terop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ namespace Java.Interop.Tools.TypeNameMappings
public
#endif
enum PackageNamingPolicy {
/// <summary>
/// A hashed package name, currently defaults to LowercaseMD5
/// </summary>
[Obsolete ("No longer supported. Use PackageNamingPolicy.LowercaseCrc64 instead.", error: true)]
LowercaseHash = 0,
Lowercase = 1,
LowercaseWithAssemblyName = 2,
[Obsolete ("No longer supported. Use PackageNamingPolicy.LowercaseCrc64 instead.", error: true)]
LowercaseMD5 = LowercaseHash,
LowercaseCrc64 = 3,
}
Expand All @@ -43,7 +42,7 @@ class JniTypeName
#endif
static class JavaNativeTypeManager {

public static PackageNamingPolicy PackageNamingPolicy { get; set; }
public static PackageNamingPolicy PackageNamingPolicy { get; set; } = PackageNamingPolicy.LowercaseCrc64;

public static string ApplicationJavaClass { get; set; }

Expand Down Expand Up @@ -203,10 +202,8 @@ public static string GetPackageName (Type type)
case PackageNamingPolicy.LowercaseCrc64:
using (var crc = new Crc64 ())
return "crc64" + ToHash (type.Namespace + ":" + assemblyName, crc);
case PackageNamingPolicy.LowercaseMD5:
default:
using (var md5 = MD5.Create ())
return "md5" + ToHash (type.Namespace + ":" + assemblyName, md5);
throw new NotSupportedException ($"PackageNamingPolicy.{PackageNamingPolicy} is no longer supported.");
}
}

Expand Down Expand Up @@ -528,10 +525,8 @@ public static string GetPackageName (TypeDefinition type)
case PackageNamingPolicy.LowercaseCrc64:
using (var crc = new Crc64 ())
return "crc64" + ToHash (type.Namespace + ":" + type.GetPartialAssemblyName (), crc);
case PackageNamingPolicy.LowercaseMD5:
default:
using (var md5 = MD5.Create ())
return "md5" + ToHash (type.Namespace + ":" + type.GetPartialAssemblyName (), md5);
throw new NotSupportedException ($"PackageNamingPolicy.{PackageNamingPolicy} is no longer supported.");
}
}
#endif
Expand Down
17 changes: 9 additions & 8 deletions tools/generator/Tests/Integration-Tests/BaseGeneratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System;
using System.Linq;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Security.Cryptography;
using Java.Interop.Tools.JavaCallableWrappers;
using NUnit.Framework;
using Xamarin.Android.Binder;
using System.Collections.Generic;

namespace generatortests
{
Expand Down Expand Up @@ -93,10 +93,11 @@ protected bool FileCompare (string file1, string file2)
byte[] f1 = ReadAllBytesIgnoringLineEndings (file1);
byte[] f2 = ReadAllBytesIgnoringLineEndings (file2);

var hash = MD5.Create ();
var f1hash = Convert.ToBase64String (hash.ComputeHash (f1));
var f2hash = Convert.ToBase64String (hash.ComputeHash (f2));
result = f1hash.Equals (f2hash);
using (var hash = new Crc64 ()) {
var f1hash = Convert.ToBase64String (hash.ComputeHash (f1));
var f2hash = Convert.ToBase64String (hash.ComputeHash (f2));
result = f1hash.Equals (f2hash);
}
}

return result;
Expand Down
4 changes: 4 additions & 0 deletions tools/generator/Tests/generator-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\..\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj">
<Project>{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}</Project>
<Name>Java.Interop.Tools.JavaCallableWrappers</Name>
</ProjectReference>
<ProjectReference Include="..\generator.csproj">
<Project>{D14A1B5C-2060-4930-92BE-F7190256C735}</Project>
<Name>generator</Name>
Expand Down