github bcgit#273: reset fix for SM2Signer

IntsiraL · Dec 22, 2017 · 2abfdbf · 2abfdbf
1 parent 2e47a48
commit 2abfdbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/core/src/main/java/org/bouncycastle/crypto/signers/SM2Signer.java b/core/src/main/java/org/bouncycastle/crypto/signers/SM2Signer.java
@@ -131,7 +131,6 @@ public byte[] generateSignature()
         throws CryptoException
     {
         byte[] eHash = digestDoFinal();
-        reset();
 
         BigInteger n = ecParams.getN();
         BigInteger e = calculateE(eHash);
@@ -225,6 +224,9 @@ private byte[] digestDoFinal()
     {
         byte[] result = new byte[digest.getDigestSize()];
         digest.doFinal(result, 0);
+
+        reset();
+
         return result;
     }
 

diff --git a/prov/src/test/java/org/bouncycastle/jce/provider/test/SM2SignatureTest.java b/prov/src/test/java/org/bouncycastle/jce/provider/test/SM2SignatureTest.java
@@ -49,6 +49,7 @@ private void doSignerTestFp()
 
         signer.setParameter(new SM2ParameterSpec(Strings.toByteArray("[email protected]")));
 
+        // repetition test
         final int times = 2;
         String random = "";
         for (int i = 0; i < times; i++) {
@@ -59,6 +60,12 @@ private void doSignerTestFp()
 
         byte[] msg = Strings.toByteArray("message digest");
 
+        Signature verifier = Signature.getInstance("SM3withSM2", "BC");
+
+        verifier.setParameter(new SM2ParameterSpec(Strings.toByteArray("[email protected]")));
+
+        verifier.initVerify(kp.getPublic());
+
         for (int i = 0; i < times; i++) {
             signer.update(msg, 0, msg.length);
 
@@ -69,10 +76,6 @@ private void doSignerTestFp()
             isTrue("r wrong", rs[0].equals(new BigInteger("40F1EC59F793D9F49E09DCEF49130D4194F79FB1EED2CAA55BACDB49C4E755D1", 16)));
             isTrue("s wrong", rs[1].equals(new BigInteger("6FC6DAC32C5D5CF10C77DFB20F7C2EB667A457872FB09EC56327A67EC7DEEBE7", 16)));
 
-            Signature verifier = Signature.getInstance("SM3withSM2", "BC");
-            verifier.setParameter(new SM2ParameterSpec(Strings.toByteArray("[email protected]")));
-            verifier.initVerify(kp.getPublic());
-
             verifier.update(msg, 0, msg.length);
 
             isTrue("verification failed i=" + i, verifier.verify(sig));