Merge pull request Hyperledger-TWGC#16 from yzwyzwyzw1/dev-fabric

modify sm4.ReadKeyFromPem

Author: czdsdo

sm2/sm2.go

@@ -543,6 +543,7 @@ func GenerateKey(random io.Reader) (*PrivateKey, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	k := new(big.Int).SetBytes(b)
 	n := new(big.Int).Sub(params.N, two)
 	k.Mod(k, n)
@@ -551,6 +552,7 @@ func GenerateKey(random io.Reader) (*PrivateKey, error) {
 	priv.PublicKey.Curve = c
 	priv.D = k
 	priv.PublicKey.X, priv.PublicKey.Y = c.ScalarBaseMult(k.Bytes())
+
 	return priv, nil
 }
 

sm2/sm2_test.go

@@ -26,7 +26,8 @@ import (
 )
 
 func TestSm2(t *testing.T) {
-	priv, err := GenerateKey(nil) // 生成密钥对
+	priv, err := GenerateKey(rand.Reader) // 生成密钥对
+	fmt.Println(priv)
 	if err != nil {
 		t.Fatal(err)
 	}

x509/pkcs8.go

@@ -172,6 +172,9 @@ func MarshalSm2PublicKey(key *sm2.PublicKey) ([]byte, error) {
 	var r pkixPublicKey
 	var algo pkix.AlgorithmIdentifier
 
+	if(key.Curve.Params()!=sm2.P256Sm2().Params()){
+		return nil, errors.New("x509: unsupported elliptic curve")
+	}
 	algo.Algorithm = oidSM2
 	algo.Parameters.Class = 0
 	algo.Parameters.Tag = 6
@@ -277,6 +280,7 @@ func ParsePKCS8EcryptedPrivateKey(der, pwd []byte) (*sm2.PrivateKey, error) {
 
 func ParsePKCS8PrivateKey(der, pwd []byte) (*sm2.PrivateKey, error) {
 	if pwd == nil {
+		
 		return ParsePKCS8UnecryptedPrivateKey(der)
 	}
 	return ParsePKCS8EcryptedPrivateKey(der, pwd)