Merge remote-tracking branch 'origin/dev-1.0' into dev-1.0

# Conflicts:
#	src/test/java/test/LongDataTest.java

src/test/java/test/LongDataTest.java

@@ -99,7 +99,7 @@ public class LongDataTest {
             int lucky = new Random().nextInt(4065);
             byte[] data = new byte[lucky];
             System.out.println("len="+lucky);
-            new Random().nextBytes( data );
+//            new Random().nextBytes( data );
             sydApiMac.update(data);
         }
 
@@ -113,7 +113,7 @@ public class LongDataTest {
 
     @Test
     public void case5(){
-        SydApiSM4 sydApiSM4 = api.initSM4(api, 1,1);
+        SydApiSM4 sydApiSM4 = api.initSM4(1,1);
         byte[] enData = sydApiSM4.finish();
         System.out.println(Util.bytes2HexString( enData ) );
         Assert.assertArrayEquals( Util.hexString2Bytes("FF49F76AD3A71651FE1A8A9F0D2A689E"), enData );
@@ -121,7 +121,7 @@ public class LongDataTest {
 
     @Test
     public void case6(){
-        SydApiSM4 sydApiSM4 = api.initSM4(api, 1,1);
+        SydApiSM4 sydApiSM4 = api.initSM4(1,1);
 
         for (int i =0 ; i < 10; i ++) {
             int lucky = new Random().nextInt(4065);
@@ -136,6 +136,22 @@ public class LongDataTest {
         System.out.println(Util.bytes2HexString( enData ) );
     }
 
+    @Test
+    public void case12(){
+        for (int i =0 ; i < 1000; i ++) {
+            int lucky = new Random().nextInt(4065);
+            SydApiSM4 sydApiSM4 = api.initSM4( 1,1);
+            byte[] bytes = new byte[lucky];
+            sydApiSM4.update(new byte[lucky]);
+            byte[] finish = sydApiSM4.finish();
+            SydApiSM4 sydApiSM42 = api.initSM4(1,0);
+            sydApiSM42.update(finish);
+            byte[] finish1 = sydApiSM42.finish();
+            System.out.println("原始数据："+Arrays.toString(bytes)+",\n"+"解密后数据："+Arrays.toString(finish1));
+
+        }
+
+    }
 
 
 }