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

src/test/java/com/sunyard/sydapi/test/RSASignVertify.java

@@ -0,0 +1,73 @@
+package com.sunyard.sydapi.test;
+
+import com.sunyard.RetWrap;
+import com.sunyard.proto.Util;
+import com.sunyard.util.ASN1Util;
+import racal.sunyard.main.SydApi4j;
+import racal.sunyard.main.SydApiBuilder;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+public class RSASignVertify {
+    private static final String RSADN = "C=cn,O=CFCA TEST CA,OU=CIPSTEST,OU=Units,CN=041@3CIPSCNSHCLR@CN000000129@00000018";
+    private static final byte[] orgData={1,2,3,4,5,6};
+    private static final String SM2DN = "C=CN,O=123,OU=23,OU=23,CN=32";
+
+    //    public p1
+//    p7attach
+//    p7detach
+     public static void main(String[] args) throws IOException {
+         //System.setProperty("com.sunyard.sydapi4j.debug", "true");
+         //long startTime = System.currentTimeMillis();    //设置系统时间
+         SydApiBuilder builder = new SydApiBuilder().setIp("172.16.18.59");
+         SydApi4j api = (SydApi4j) builder.build();
+
+
+         //
+//         byte[] nakedSign = api.SYD_NakedSign(1,orgData,RSADN);
+//         System.out.println("nakedSign"+nakedSign);
+//         byte[] sm2Sign = api.SYD_NakedSign(orgData,SM2DN);
+//         System.out.println("sm2Sign:"+sm2Sign);
+//
+//         boolean nakedVerify = api.SYD_NakedVerify(1, orgData, nakedSign, RSADN);
+//         System.out.println(nakedVerify);
+//         boolean nakedVerify2 = api.SYD_NakedVerify( orgData, sm2Sign, SM2DN);
+//         System.out.println(nakedVerify2);
+
+//         String attachedSign = api.attachedSign(orgData, SM2DN);
+//         //System.out.println(attachedSign);
+//         boolean attachedVerify = api.attachedVerify(attachedSign);
+//         System.out.println(attachedVerify);
+//
+//         String attachedSign2 = api.attachedSign(1,orgData, RSADN);
+//         String attachedSign3 = api.attachedSign(2,orgData, RSADN);
+//         String attachedSign4 = api.attachedSign(3,orgData, RSADN);
+//         System.out.println("签名1："+attachedSign2);
+//         System.out.println("签名2："+attachedSign3);
+//         System.out.println("签名3："+attachedSign4);
+//         boolean attachedVerify2 = api.attachedVerify(attachedSign2);
+//         RetWrap retWrap = ASN1Util.takeOutOriginDataFromPKCS7Sign(attachedSign2);
+//         System.out.println(attachedVerify2);
+//         byte[] orgData = (byte[]) retWrap.get("orgData");
+//         String cert = (String) retWrap.get("cert");
+//         System.out.println(Util.bytes2HexString(orgData));
+//         System.out.println(Util.bytes2HexString(Util.decodeBase64(cert)));
+//         System.out.println("证书："+Util.bytes2HexString(Util.encodeBase64(RSADN.getBytes("GBK")).getBytes("GBK")));
+
+          String detachedSign = api.detachedSign(1, orgData, SM2DN);
+         System.out.println(detachedSign);
+         String detachedSign2 = api.detachedSign(1,0, orgData, RSADN);
+        System.out.println(detachedSign2);
+         boolean detachedVerify = api.detachedVerify(1, orgData, detachedSign);
+         boolean detachedVerify2 = api.detachedVerify(1,0, orgData, detachedSign2);
+         System.out.println(detachedVerify);
+         System.out.println(detachedVerify2);
+
+//         String RSAsign = api.attachedSign(1, orgData.getBytes("GBK"), RSADN);
+
+
+
+     }
+
+}

src/test/java/com/sunyard/sydapi/test/TestLast.java

@@ -537,7 +537,7 @@ public class TestLast {
         RetWrap retWrap1 = api.conutHash(1,0,  key2.getBytes(), key1.getBytes());
         byte[] bytes = api.RSASignC("0000000000000005", 1, 0,(byte[]) retWrap1.get("hash"));
         System.out.println(bytes);
-    }*/
+    }
 
 
   /*  //15.6 RSA验证签名(+)
@@ -560,7 +560,7 @@ public class TestLast {
     //15.7计算HASH散列值(MD5\SHA1\SHA256)(+) -> pass
     @Test
     public void RSASignC() {
-        RetWrap retWrap1 = api.conutHash(1, 0, key2.getBytes(), key1.getBytes());
+        RetWrap retWrap1 = api.countHash(1, 0, key2.getBytes(), key1.getBytes());
         System.out.println(retWrap1);
     }