crypto和默认命名保持一致

Author: springrain

kernel/contract/sandbox/cross_query_cache.go

@@ -248,7 +248,22 @@ func isEndorsorSignValid(signsValid []*pb.SignatureInfo, queryInfo *pb.CrossQuer
 		//log.Info("Marshal Response failed", "err", err)
 		return false
 	}
+<<<<<<< HEAD
 	cryptoClient, err := crypto_client.CreateCryptoClient(crypto_client.CryptoTypeDefault)
+=======
+
+	//bug(springrain) 需要定义一个参数,用于标示目标链的的加密方式,默认非国密
+	cryptoType := crypto_client.CryptoTypeDefault
+	argsMap := queryInfo.GetRequest().Request.GetArgs()
+	if argsMap != nil {
+		if crypto, ok := argsMap["crypto"]; ok {
+			if string(crypto) == "gm" {
+				cryptoType = "gm"
+			}
+		}
+	}
+	cryptoClient, err := crypto_client.CreateCryptoClient(cryptoType)
+>>>>>>> d35f343 (crypto和默认命名保持一致)
 	data := append(reqData[:], resData[:]...)
 	digest := hash.UsingSha256(data)
 	for idx := range signsValid {