Skip to content

Commit 2c0baab

Browse files
authored
Merge pull request #651 from ikvmnet/reorgaes
Organize and comment on AES implementations.
2 parents 6f6d70d + e04d0fb commit 2c0baab

15 files changed

+974
-799
lines changed

src/IKVM.Java/map.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1648,7 +1648,7 @@
16481648
<ldarg_0 />
16491649
<ldfld class="com.sun.crypto.provider.AESCrypt" name="K" sig="[I" />
16501650
<!-- bool AESCrypt.DecryptBlock(byte[] in, int inOffset, byte[] out, int outOffset, int[] K) -->
1651-
<call type="IKVM.Java.Externs.com.sun.crypto.provider.AESCrypt" name="DecryptBlock" sig="([BI[BI[I)Z" />
1651+
<call type="IKVM.Runtime.Util.Com.Sun.Crypto.Provider.AESCrypt" name="DecryptBlock" sig="([BI[BI[I)Z" />
16521652
<brfalse name="continue" />
16531653
<ret />
16541654
<label name="continue" />
@@ -1663,7 +1663,7 @@
16631663
<ldarg_0 />
16641664
<ldfld class="com.sun.crypto.provider.AESCrypt" name="K" sig="[I" />
16651665
<!-- bool AESCrypt.EncryptBlock(byte[] in, int inOffset, byte[] out, int outOffset, int[] K) -->
1666-
<call type="IKVM.Java.Externs.com.sun.crypto.provider.AESCrypt" name="EncryptBlock" sig="([BI[BI[I)Z" />
1666+
<call type="IKVM.Runtime.Util.Com.Sun.Crypto.Provider.AESCrypt" name="EncryptBlock" sig="([BI[BI[I)Z" />
16671667
<brfalse name="continue" />
16681668
<ret />
16691669
<label name="continue" />
@@ -1679,7 +1679,7 @@
16791679
<ldarg_3 />
16801680
<ldarg_s argNum="4" />
16811681
<!-- bool GHASH.ProcessBlocks(byte[] data, int inOffs, int blocks, long[] state, long[] subH) -->
1682-
<call type="IKVM.Java.Externs.com.sun.crypto.provider.GHASH" name="ProcessBlocks" sig="([BII[J[J)Z" />
1682+
<call type="IKVM.Runtime.Util.Com.Sun.Crypto.Provider.GHASH" name="ProcessBlocks" sig="([BII[J[J)Z" />
16831683
<brfalse name="continue" />
16841684
<ret />
16851685
<label name="continue" />
@@ -1696,7 +1696,7 @@
16961696
<ldarg_s argNum="4" />
16971697
<ldarg_s argNum="5" />
16981698
<!-- bool CipherBlockChaining.DecryptAESCrypt(object self, byte[] cipher, int cipherOffset, int cipherLen, byte[] plain, int plainOffset, ) -->
1699-
<call type="IKVM.Java.Externs.com.sun.crypto.provider.CipherBlockChaining" name="DecryptAESCrypt" sig="(Ljava.lang.Object;[BII[BI)Z" />
1699+
<call type="IKVM.Runtime.Util.Com.Sun.Crypto.Provider.CipherBlockChaining" name="DecryptAESCrypt" sig="(Ljava.lang.Object;[BII[BI)Z" />
17001700
<brfalse name="continue" />
17011701
<ldarg_3 />
17021702
<ret />
@@ -1712,7 +1712,7 @@
17121712
<ldarg_s argNum="4" />
17131713
<ldarg_s argNum="5" />
17141714
<!-- bool CipherBlockChaining.EncryptAESCrypt(object self, byte[] plain, int plainOffset, int plainLen, byte[] cipher, int cipherOffset) -->
1715-
<call type="IKVM.Java.Externs.com.sun.crypto.provider.CipherBlockChaining" name="EncryptAESCrypt" sig="(Ljava.lang.Object;[BII[BI)Z" />
1715+
<call type="IKVM.Runtime.Util.Com.Sun.Crypto.Provider.CipherBlockChaining" name="EncryptAESCrypt" sig="(Ljava.lang.Object;[BII[BI)Z" />
17161716
<brfalse name="continue" />
17171717
<ldarg_3 />
17181718
<ret />

src/IKVM.Runtime/Java/Externs/com/sun/crypto/provider/AESCrypt.X86.cs

-163
This file was deleted.

src/IKVM.Runtime/Java/Externs/com/sun/crypto/provider/AESCrypt.cs

-37
This file was deleted.

0 commit comments

Comments
 (0)