[This fixes FAB-3969]

Change-Id: I35884c0d32fc2a201313839d1c4ad180c49972ea
Signed-off-by: liuwenliang0632@qq.com <liuwenliang0632@qq.com>

Author: liuwenliang0632

src/main/java/org/hyperledger/fabric/sdk/helper/ChainUtils.java

@@ -0,0 +1,63 @@
+/*
+Copyright DTCC 2016 All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package org.hyperledger.fabric.sdk.helper;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.bouncycastle.asn1.ASN1Integer;
+import org.bouncycastle.asn1.DEROctetString;
+import org.bouncycastle.asn1.DERSequenceGenerator;
+import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
+import org.hyperledger.fabric.sdk.security.CryptoSuite;
+
+
+public class ChainUtils {
+
+    public static CryptoSuite suite = null;
+   /**
+     * used asn1 and get hash
+     * @param blockNumber
+     * @param previousHash
+     * @param dataHash
+     * @return byte[]
+     * @throws IOException
+     * @throws InvalidArgumentException
+     */
+    public static byte[] calculateBlockHash(long blockNumber, byte[] previousHash, byte[] dataHash) throws IOException, InvalidArgumentException{
+
+        if (previousHash == null) {
+            throw new InvalidArgumentException("previousHash parameter is null.");
+        }
+        if (dataHash == null) {
+            throw new InvalidArgumentException("dataHash parameter is null.");
+        }
+
+        if(null == suite){
+            suite = CryptoSuite.Factory.getCryptoSuite();
+        }
+
+        ByteArrayOutputStream s = new ByteArrayOutputStream();
+        DERSequenceGenerator seq = new DERSequenceGenerator(s);
+        seq.addObject(new ASN1Integer(blockNumber));
+        seq.addObject(new DEROctetString(previousHash));
+        seq.addObject(new DEROctetString(dataHash));
+        seq.close();
+        return suite.hash(s.toByteArray());
+
+    }
+}

src/test/java/org/hyperledger/fabric/sdkintegration/End2endIT.java

@@ -15,6 +15,7 @@
 package org.hyperledger.fabric.sdkintegration;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.nio.file.Paths;
@@ -52,6 +53,7 @@
 import org.hyperledger.fabric.sdk.exception.InvalidProtocolBufferRuntimeException;
 import org.hyperledger.fabric.sdk.exception.ProposalException;
 import org.hyperledger.fabric.sdk.exception.TransactionEventException;
+import org.hyperledger.fabric.sdk.helper.ChainUtils;
 import org.hyperledger.fabric.sdk.security.CryptoSuite;
 import org.hyperledger.fabric.sdk.testutils.TestConfig;
 import org.hyperledger.fabric_ca.sdk.HFCAClient;
@@ -631,7 +633,7 @@ File findFile_sk(File directory) {
         txExpected.put("writeset1", "Missing writeset for channel bar block 1");
     }
 
-    void blockWalker(Channel channel) throws InvalidProtocolBufferException, InvalidArgumentException, ProposalException, UnsupportedEncodingException {
+    void blockWalker(Channel channel) throws InvalidProtocolBufferException, InvalidArgumentException, ProposalException, UnsupportedEncodingException, IOException {
 
         try {
             BlockchainInfo channelInfo = channel.queryBlockchainInfo();
@@ -642,6 +644,7 @@ void blockWalker(Channel channel) throws InvalidProtocolBufferException, Invalid
 
                 out("current block number %d has data hash: %s", blockNumber, Hex.encodeHexString(returnedBlock.getDataHash()));
                 out("current block number %d has previous hash id: %s", blockNumber, Hex.encodeHexString(returnedBlock.getPreviousHash()));
+                out("current block number %d has calculated block hash is %s", blockNumber, Hex.encodeHexString(ChainUtils.calculateBlockHash(blockNumber, returnedBlock.getPreviousHash(), returnedBlock.getDataHash())));
 
                 final int envelopCount = returnedBlock.getEnvelopCount();
                 assertEquals(1, envelopCount);