Skip to content

Commit 0bae34a

Browse files
jonathanpeppersjonathanpeppers
committed
Add CRC64 and new PackageNamingPolicy
Context: dotnet/android#1580 FIPS-compliant Windows 10 machines will throw an exception if the `System.Security.Cryptography.MD5` class is used. We are not using this for cryptography, but for naming collisions in Java package names. Therefore we can switch to using `CRC64` instead of `MD5`. A simple implementation using a lookup table will suffice for our purposes. I also expanded the enum: enum PackageNamingPolicy { LowercaseHash = 1, Lowercase = 2, LowercaseWithAssemblyName = 3, LowercaseMD5 = LowercaseHash, LowercaseCRC64 = 4, } It will currently default to `MD5` as before, but can be changed to `LowercaseCRC64` as needed. At some point we might also change the default value of `LowercaseHash`. Further changes will need to be made upstream in xamarin/xamarin-android to replace (or make optional) usage of `MD5` vs `CRC64`.
1 parent be6048e commit 0bae34a

File tree

6 files changed

+277
-13
lines changed

6 files changed

+277
-13
lines changed

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
</ItemGroup>
3636
<ItemGroup>
3737
<Compile Include="Properties\AssemblyInfo.cs" />
38+
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\CRC64.cs" />
3839
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\JavaCallableWrapperGenerator.cs" />
3940
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\JavaTypeScanner.cs" />
4041
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\TypeNameMapGenerator.cs" />

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/CRC64.cs

+156
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
using System;
2+
using System.Security.Cryptography;
3+
4+
namespace Java.Interop.Tools.JavaCallableWrappers
5+
{
6+
/// <summary>
7+
/// CRC64 variant: crc-64-jones 64-bit
8+
/// * Poly: 0xad93d23594c935a9
9+
/// </summary>
10+
public class CRC64 : HashAlgorithm
11+
{
12+
static readonly ulong [] Table = {
13+
0x0000000000000000, 0x7ad870c830358979,
14+
0xf5b0e190606b12f2, 0x8f689158505e9b8b,
15+
0xc038e5739841b68f, 0xbae095bba8743ff6,
16+
0x358804e3f82aa47d, 0x4f50742bc81f2d04,
17+
0xab28ecb46814fe75, 0xd1f09c7c5821770c,
18+
0x5e980d24087fec87, 0x24407dec384a65fe,
19+
0x6b1009c7f05548fa, 0x11c8790fc060c183,
20+
0x9ea0e857903e5a08, 0xe478989fa00bd371,
21+
0x7d08ff3b88be6f81, 0x07d08ff3b88be6f8,
22+
0x88b81eabe8d57d73, 0xf2606e63d8e0f40a,
23+
0xbd301a4810ffd90e, 0xc7e86a8020ca5077,
24+
0x4880fbd87094cbfc, 0x32588b1040a14285,
25+
0xd620138fe0aa91f4, 0xacf86347d09f188d,
26+
0x2390f21f80c18306, 0x594882d7b0f40a7f,
27+
0x1618f6fc78eb277b, 0x6cc0863448deae02,
28+
0xe3a8176c18803589, 0x997067a428b5bcf0,
29+
0xfa11fe77117cdf02, 0x80c98ebf2149567b,
30+
0x0fa11fe77117cdf0, 0x75796f2f41224489,
31+
0x3a291b04893d698d, 0x40f16bccb908e0f4,
32+
0xcf99fa94e9567b7f, 0xb5418a5cd963f206,
33+
0x513912c379682177, 0x2be1620b495da80e,
34+
0xa489f35319033385, 0xde51839b2936bafc,
35+
0x9101f7b0e12997f8, 0xebd98778d11c1e81,
36+
0x64b116208142850a, 0x1e6966e8b1770c73,
37+
0x8719014c99c2b083, 0xfdc17184a9f739fa,
38+
0x72a9e0dcf9a9a271, 0x08719014c99c2b08,
39+
0x4721e43f0183060c, 0x3df994f731b68f75,
40+
0xb29105af61e814fe, 0xc849756751dd9d87,
41+
0x2c31edf8f1d64ef6, 0x56e99d30c1e3c78f,
42+
0xd9810c6891bd5c04, 0xa3597ca0a188d57d,
43+
0xec09088b6997f879, 0x96d1784359a27100,
44+
0x19b9e91b09fcea8b, 0x636199d339c963f2,
45+
0xdf7adabd7a6e2d6f, 0xa5a2aa754a5ba416,
46+
0x2aca3b2d1a053f9d, 0x50124be52a30b6e4,
47+
0x1f423fcee22f9be0, 0x659a4f06d21a1299,
48+
0xeaf2de5e82448912, 0x902aae96b271006b,
49+
0x74523609127ad31a, 0x0e8a46c1224f5a63,
50+
0x81e2d7997211c1e8, 0xfb3aa75142244891,
51+
0xb46ad37a8a3b6595, 0xceb2a3b2ba0eecec,
52+
0x41da32eaea507767, 0x3b024222da65fe1e,
53+
0xa2722586f2d042ee, 0xd8aa554ec2e5cb97,
54+
0x57c2c41692bb501c, 0x2d1ab4dea28ed965,
55+
0x624ac0f56a91f461, 0x1892b03d5aa47d18,
56+
0x97fa21650afae693, 0xed2251ad3acf6fea,
57+
0x095ac9329ac4bc9b, 0x7382b9faaaf135e2,
58+
0xfcea28a2faafae69, 0x8632586aca9a2710,
59+
0xc9622c4102850a14, 0xb3ba5c8932b0836d,
60+
0x3cd2cdd162ee18e6, 0x460abd1952db919f,
61+
0x256b24ca6b12f26d, 0x5fb354025b277b14,
62+
0xd0dbc55a0b79e09f, 0xaa03b5923b4c69e6,
63+
0xe553c1b9f35344e2, 0x9f8bb171c366cd9b,
64+
0x10e3202993385610, 0x6a3b50e1a30ddf69,
65+
0x8e43c87e03060c18, 0xf49bb8b633338561,
66+
0x7bf329ee636d1eea, 0x012b592653589793,
67+
0x4e7b2d0d9b47ba97, 0x34a35dc5ab7233ee,
68+
0xbbcbcc9dfb2ca865, 0xc113bc55cb19211c,
69+
0x5863dbf1e3ac9dec, 0x22bbab39d3991495,
70+
0xadd33a6183c78f1e, 0xd70b4aa9b3f20667,
71+
0x985b3e827bed2b63, 0xe2834e4a4bd8a21a,
72+
0x6debdf121b863991, 0x1733afda2bb3b0e8,
73+
0xf34b37458bb86399, 0x8993478dbb8deae0,
74+
0x06fbd6d5ebd3716b, 0x7c23a61ddbe6f812,
75+
0x3373d23613f9d516, 0x49aba2fe23cc5c6f,
76+
0xc6c333a67392c7e4, 0xbc1b436e43a74e9d,
77+
0x95ac9329ac4bc9b5, 0xef74e3e19c7e40cc,
78+
0x601c72b9cc20db47, 0x1ac40271fc15523e,
79+
0x5594765a340a7f3a, 0x2f4c0692043ff643,
80+
0xa02497ca54616dc8, 0xdafce7026454e4b1,
81+
0x3e847f9dc45f37c0, 0x445c0f55f46abeb9,
82+
0xcb349e0da4342532, 0xb1eceec59401ac4b,
83+
0xfebc9aee5c1e814f, 0x8464ea266c2b0836,
84+
0x0b0c7b7e3c7593bd, 0x71d40bb60c401ac4,
85+
0xe8a46c1224f5a634, 0x927c1cda14c02f4d,
86+
0x1d148d82449eb4c6, 0x67ccfd4a74ab3dbf,
87+
0x289c8961bcb410bb, 0x5244f9a98c8199c2,
88+
0xdd2c68f1dcdf0249, 0xa7f41839ecea8b30,
89+
0x438c80a64ce15841, 0x3954f06e7cd4d138,
90+
0xb63c61362c8a4ab3, 0xcce411fe1cbfc3ca,
91+
0x83b465d5d4a0eece, 0xf96c151de49567b7,
92+
0x76048445b4cbfc3c, 0x0cdcf48d84fe7545,
93+
0x6fbd6d5ebd3716b7, 0x15651d968d029fce,
94+
0x9a0d8ccedd5c0445, 0xe0d5fc06ed698d3c,
95+
0xaf85882d2576a038, 0xd55df8e515432941,
96+
0x5a3569bd451db2ca, 0x20ed197575283bb3,
97+
0xc49581ead523e8c2, 0xbe4df122e51661bb,
98+
0x3125607ab548fa30, 0x4bfd10b2857d7349,
99+
0x04ad64994d625e4d, 0x7e7514517d57d734,
100+
0xf11d85092d094cbf, 0x8bc5f5c11d3cc5c6,
101+
0x12b5926535897936, 0x686de2ad05bcf04f,
102+
0xe70573f555e26bc4, 0x9ddd033d65d7e2bd,
103+
0xd28d7716adc8cfb9, 0xa85507de9dfd46c0,
104+
0x273d9686cda3dd4b, 0x5de5e64efd965432,
105+
0xb99d7ed15d9d8743, 0xc3450e196da80e3a,
106+
0x4c2d9f413df695b1, 0x36f5ef890dc31cc8,
107+
0x79a59ba2c5dc31cc, 0x037deb6af5e9b8b5,
108+
0x8c157a32a5b7233e, 0xf6cd0afa9582aa47,
109+
0x4ad64994d625e4da, 0x300e395ce6106da3,
110+
0xbf66a804b64ef628, 0xc5bed8cc867b7f51,
111+
0x8aeeace74e645255, 0xf036dc2f7e51db2c,
112+
0x7f5e4d772e0f40a7, 0x05863dbf1e3ac9de,
113+
0xe1fea520be311aaf, 0x9b26d5e88e0493d6,
114+
0x144e44b0de5a085d, 0x6e963478ee6f8124,
115+
0x21c640532670ac20, 0x5b1e309b16452559,
116+
0xd476a1c3461bbed2, 0xaeaed10b762e37ab,
117+
0x37deb6af5e9b8b5b, 0x4d06c6676eae0222,
118+
0xc26e573f3ef099a9, 0xb8b627f70ec510d0,
119+
0xf7e653dcc6da3dd4, 0x8d3e2314f6efb4ad,
120+
0x0256b24ca6b12f26, 0x788ec2849684a65f,
121+
0x9cf65a1b368f752e, 0xe62e2ad306bafc57,
122+
0x6946bb8b56e467dc, 0x139ecb4366d1eea5,
123+
0x5ccebf68aecec3a1, 0x2616cfa09efb4ad8,
124+
0xa97e5ef8cea5d153, 0xd3a62e30fe90582a,
125+
0xb0c7b7e3c7593bd8, 0xca1fc72bf76cb2a1,
126+
0x45775673a732292a, 0x3faf26bb9707a053,
127+
0x70ff52905f188d57, 0x0a2722586f2d042e,
128+
0x854fb3003f739fa5, 0xff97c3c80f4616dc,
129+
0x1bef5b57af4dc5ad, 0x61372b9f9f784cd4,
130+
0xee5fbac7cf26d75f, 0x9487ca0fff135e26,
131+
0xdbd7be24370c7322, 0xa10fceec0739fa5b,
132+
0x2e675fb4576761d0, 0x54bf2f7c6752e8a9,
133+
0xcdcf48d84fe75459, 0xb71738107fd2dd20,
134+
0x387fa9482f8c46ab, 0x42a7d9801fb9cfd2,
135+
0x0df7adabd7a6e2d6, 0x772fdd63e7936baf,
136+
0xf8474c3bb7cdf024, 0x829f3cf387f8795d,
137+
0x66e7a46c27f3aa2c, 0x1c3fd4a417c62355,
138+
0x935745fc4798b8de, 0xe98f353477ad31a7,
139+
0xa6df411fbfb21ca3, 0xdc0731d78f8795da,
140+
0x536fa08fdfd90e51, 0x29b7d047efec8728,
141+
};
142+
143+
ulong crc;
144+
145+
public override void Initialize () { }
146+
147+
protected override void HashCore (byte [] array, int ibStart, int cbSize)
148+
{
149+
for (int i = ibStart; i < cbSize; i++) {
150+
crc = Table [(byte) (crc ^ array [i])] ^ (crc >> 8);
151+
}
152+
}
153+
154+
protected override byte [] HashFinal () => BitConverter.GetBytes (crc);
155+
}
156+
}

‎src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
</ItemGroup>
3939
<ItemGroup>
4040
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\JavaCallableWrapperGeneratorTests.cs" />
41+
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\CRC64Tests.cs" />
42+
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\JavaNativeTypeManagerTests.cs" />
4143
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\TypeNameMapGeneratorTests.cs" />
4244
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\SupportDeclarations.cs" />
4345
<Compile Include="Android.App\ActivityAttribute.cs" />

‎src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/CRC64Tests.cs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Text;
2+
using Java.Interop.Tools.JavaCallableWrappers;
3+
using NUnit.Framework;
4+
5+
namespace Java.Interop.Tools.JavaCallableWrappersTests
6+
{
7+
[TestFixture]
8+
public class CRC64Tests
9+
{
10+
static string ToHash (string value)
11+
{
12+
var data = Encoding.UTF8.GetBytes (value);
13+
using (var crc = new CRC64 ()) {
14+
var hash = crc.ComputeHash (data);
15+
var buf = new StringBuilder (hash.Length * 2);
16+
foreach (var b in hash)
17+
buf.AppendFormat ("{0:x2}", b);
18+
return buf.ToString ();
19+
}
20+
}
21+
22+
[Test]
23+
public void Hello ()
24+
{
25+
var actual = ToHash ("hello");
26+
Assert.AreEqual ("a27666cb10ddb0d6", actual);
27+
}
28+
29+
[Test]
30+
public void XmlDocument ()
31+
{
32+
var actual = ToHash ("System.Xml.XmlDocument, System.Xml");
33+
Assert.AreEqual ("2fbc43b3a95193ae", actual);
34+
}
35+
}
36+
}

‎src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using Java.Interop.Tools.TypeNameMappings;
7+
using NUnit.Framework;
8+
9+
namespace Java.Interop.Tools.JavaCallableWrappersTests
10+
{
11+
[TestFixture]
12+
public class JavaNativeTypeManagerTests
13+
{
14+
PackageNamingPolicy existingValue;
15+
16+
[SetUp]
17+
public void SetUp ()
18+
{
19+
existingValue = JavaNativeTypeManager.PackageNamingPolicy;
20+
}
21+
22+
[TearDown]
23+
public void TearDown ()
24+
{
25+
JavaNativeTypeManager.PackageNamingPolicy = existingValue;
26+
}
27+
28+
[Test]
29+
public void MD5 ()
30+
{
31+
JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseMD5;
32+
Assert.AreEqual ("md5acb69d261d9efeb0927dd7ff443b9a3a", JavaNativeTypeManager.GetPackageName (typeof (string)));
33+
}
34+
35+
[Test]
36+
public void CRC64 ()
37+
{
38+
JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseCRC64;
39+
Assert.AreEqual ("crc0005e817d0491b19", JavaNativeTypeManager.GetPackageName (typeof (string)));
40+
}
41+
42+
[Test]
43+
public void Lowercase ()
44+
{
45+
JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.Lowercase;
46+
Assert.AreEqual ("system", JavaNativeTypeManager.GetPackageName (typeof (string)));
47+
}
48+
49+
[Test]
50+
public void LowercaseWithAssemblyName ()
51+
{
52+
JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseWithAssemblyName;
53+
Assert.AreEqual ("assembly_mscorlib.system", JavaNativeTypeManager.GetPackageName (typeof (string)));
54+
}
55+
}
56+
}

‎src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs

+26-13
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,14 @@ namespace Java.Interop.Tools.TypeNameMappings
1919
public
2020
#endif
2121
enum PackageNamingPolicy {
22-
LowercaseHash,
23-
Lowercase,
24-
LowercaseWithAssemblyName,
22+
/// <summary>
23+
/// A hashed package name, currently defaults to LowercaseMD5
24+
/// </summary>
25+
LowercaseHash = 1,
26+
Lowercase = 2,
27+
LowercaseWithAssemblyName = 3,
28+
LowercaseMD5 = LowercaseHash,
29+
LowercaseCRC64 = 4,
2530
}
2631

2732
#if HAVE_CECIL
@@ -195,8 +200,13 @@ public static string GetPackageName (Type type)
195200
return type.Namespace.ToLowerInvariant ();
196201
case PackageNamingPolicy.LowercaseWithAssemblyName:
197202
return "assembly_" + (assemblyName.Replace ('.', '_') + "." + type.Namespace).ToLowerInvariant ();
203+
case PackageNamingPolicy.LowercaseCRC64:
204+
using (var crc = new CRC64 ())
205+
return "crc" + ToHash (type.Namespace + ":" + assemblyName, crc);
206+
case PackageNamingPolicy.LowercaseMD5:
198207
default:
199-
return "md5" + ToMd5 (type.Namespace + ":" + assemblyName);
208+
using (var md5 = MD5.Create ())
209+
return "md5" + ToHash (type.Namespace + ":" + assemblyName, md5);
200210
}
201211
}
202212

@@ -515,8 +525,13 @@ public static string GetPackageName (TypeDefinition type)
515525
return type.Namespace.ToLowerInvariant ();
516526
case PackageNamingPolicy.LowercaseWithAssemblyName:
517527
return "assembly_" + (type.GetPartialAssemblyName ().Replace ('.', '_') + "." + type.Namespace).ToLowerInvariant ();
528+
case PackageNamingPolicy.LowercaseCRC64:
529+
using (var crc = new CRC64 ())
530+
return "crc" + ToHash (type.Namespace + ":" + type.GetPartialAssemblyName (), crc);
531+
case PackageNamingPolicy.LowercaseMD5:
518532
default:
519-
return "md5" + ToMd5 (type.Namespace + ":" + type.GetPartialAssemblyName ());
533+
using (var md5 = MD5.Create ())
534+
return "md5" + ToHash (type.Namespace + ":" + type.GetPartialAssemblyName (), md5);
520535
}
521536
}
522537
#endif
@@ -583,16 +598,14 @@ static IEnumerable<MethodDefinition> GetBaseConstructors (TypeDefinition type)
583598
}
584599
#endif // HAVE_CECIL
585600

586-
static string ToMd5 (string value)
601+
static string ToHash (string value, HashAlgorithm algorithm)
587602
{
588603
var data = Encoding.UTF8.GetBytes (value);
589-
using (var md5 = MD5.Create ()) {
590-
var hash = md5.ComputeHash (data);
591-
var buf = new StringBuilder (hash.Length * 2);
592-
foreach (var b in hash)
593-
buf.AppendFormat ("{0:x2}", b);
594-
return buf.ToString ();
595-
}
604+
var hash = algorithm.ComputeHash (data);
605+
var buf = new StringBuilder (hash.Length * 2);
606+
foreach (var b in hash)
607+
buf.AppendFormat ("{0:x2}", b);
608+
return buf.ToString ();
596609
}
597610

598611
static string ToLowerCase (string value)

0 commit comments

Comments
 (0)