Refactor ReadPrivateKeyFromPem, WritePrivateKeytoPem

Split File IO section out from func
Add interop_test.go
Add TestLoadFromPKUGM to load privateKeyPem from pku-gm
Part ot issue Hyperledger-TWGC#7

Signed-off-by: davidliu <[email protected]>

Author: davidkhala

sm2/sm2.go

@@ -34,10 +34,6 @@ var (
 	default_uid = []byte{0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38}
 )
 
-const (
-	aesIV = "IV for <SM2> CTR"
-)
-
 type PublicKey struct {
 	elliptic.Curve
 	X, Y *big.Int

sm2/sm2_test.go

@@ -45,16 +45,17 @@ func TestSm2(t *testing.T) {
 	}
 	fmt.Printf("clear text = %s\n", d1)
 
-	msg, _ = ioutil.ReadFile("ifile")           // 从文件读取数据
-	sign, err := priv.Sign(rand.Reader, msg,nil) // 签名
+	msg, _ = ioutil.ReadFile("ifile")             // 从文件读取数据
+	sign, err := priv.Sign(rand.Reader, msg, nil) // 签名
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = ioutil.WriteFile("ofile", sign, os.FileMode(0644))
+
+	err = ioutil.WriteFile("TestResult", sign, os.FileMode(0644))
 	if err != nil {
 		t.Fatal(err)
 	}
-	signdata, _ := ioutil.ReadFile("ofile")
+	signdata, _ := ioutil.ReadFile("TestResult")
 	ok := priv.Verify(msg, signdata) // 密钥验证
 	if ok != true {
 		fmt.Printf("Verify error\n")
@@ -80,7 +81,7 @@ func BenchmarkSM2(t *testing.B) {
 	}
 	t.ResetTimer()
 	for i := 0; i < t.N; i++ {
-		sign, err := priv.Sign(nil,msg,  nil) // 签名
+		sign, err := priv.Sign(nil, msg, nil) // 签名
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -101,12 +102,12 @@ func TestKEB2(t *testing.T) {
 		0x54, 0x37, 0xA5, 0x93, 0x56, 0xB8, 0x23, 0x38,
 		0xEA, 0xAD, 0xDA, 0x6C, 0xEB, 0x19, 0x90, 0x88,
 		0xF1, 0x4A, 0xE1, 0x0D, 0xEF, 0xA2, 0x29, 0xB5}
-	raBuf := []byte{0XD4, 0XDE, 0X15, 0X47, 0X4D, 0XB7, 0X4D, 0X06,
-		0X49, 0X1C, 0X44, 0X0D, 0X30, 0X5E, 0X01, 0X24,
-		0X00, 0X99, 0X0F, 0X3E, 0X39, 0X0C, 0X7E, 0X87,
-		0X15, 0X3C, 0X12, 0XDB, 0X2E, 0XA6, 0X0B, 0XB3}
+	raBuf := []byte{0xD4, 0xDE, 0x15, 0x47, 0x4D, 0xB7, 0x4D, 0x06,
+		0x49, 0x1C, 0x44, 0x0D, 0x30, 0x5E, 0x01, 0x24,
+		0x00, 0x99, 0x0F, 0x3E, 0x39, 0x0C, 0x7E, 0x87,
+		0x15, 0x3C, 0x12, 0xDB, 0x2E, 0xA6, 0x0B, 0xB3}
 
-	rbBuf := []byte{0X7E, 0x07, 0x12, 0x48, 0x14, 0xB3, 0x09, 0x48,
+	rbBuf := []byte{0x7E, 0x07, 0x12, 0x48, 0x14, 0xB3, 0x09, 0x48,
 		0x91, 0x25, 0xEA, 0xED, 0x10, 0x11, 0x13, 0x16,
 		0x4E, 0xBF, 0x0F, 0x34, 0x58, 0xC5, 0xBD, 0x88,
 		0x33, 0x5C, 0x1F, 0x9D, 0x59, 0x62, 0x43, 0xD6}

x509/interop_test.go

@@ -0,0 +1,19 @@
+package x509
+
+import (
+	"testing"
+)
+
+func TestLoadFromPKUGM(t *testing.T) {
+	var privKeyPem = `
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBG0wawIBAQQgELPz2EG+YY2QcdqF
+PMgqUC93FH9BiAq3XbLnT7C2KLmhRANCAAQqsrdHSoNTOLHNHaKrzb+9a2dbTIgZ
+skZ8Abgw90kUUkSk4zGTLgyHbYhxUuZbW5daOwC8DOpruHqBW5TvoNfe
+-----END PRIVATE KEY-----
+	`
+	_, err := ReadPrivateKeyFromPem([]byte(privKeyPem), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

x509/utils.go

@@ -13,25 +13,21 @@ import (
 	"os"
 )
 
-func ReadPrivateKeyFromPem(FileName string, pwd []byte) (*sm2.PrivateKey, error) {
-	data, err := ioutil.ReadFile(FileName)
-	if err != nil {
-		return nil, err
-	}
+func ReadPrivateKeyFromPem(privateKeyPem []byte, pwd []byte) (*sm2.PrivateKey, error) {
 	var block *pem.Block
-	block, _ = pem.Decode(data)
+	block, _ = pem.Decode(privateKeyPem)
 	if block == nil {
 		return nil, errors.New("failed to decode private key")
 	}
 	priv, err := ParsePKCS8PrivateKey(block.Bytes, pwd)
 	return priv, err
 }
 
-func WritePrivateKeytoPem(FileName string, key *sm2.PrivateKey, pwd []byte) (err error) {
+func WritePrivateKeytoPem(key *sm2.PrivateKey, pwd []byte) ([]byte, error) {
 	var block *pem.Block
 	der, err := MarshalSm2PrivateKey(key, pwd)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	if pwd != nil {
 		block = &pem.Block{
@@ -45,18 +41,7 @@ func WritePrivateKeytoPem(FileName string, key *sm2.PrivateKey, pwd []byte) (err
 		}
 	}
 	certPem := pem.EncodeToMemory(block)
-	file, err := os.Create(FileName)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err = file.Close()
-	}()
-	_, err = file.Write(certPem)
-	if err != nil {
-		return err
-	}
-	return nil
+	return certPem, nil
 }
 
 func ReadPublicKeyFromPem(FileName string) (*sm2.PublicKey, error) {
@@ -71,7 +56,7 @@ func ReadPublicKeyFromPem(FileName string) (*sm2.PublicKey, error) {
 	return ParseSm2PublicKey(block.Bytes)
 }
 
-func WritePublicKeytoPem(FileName string, key *sm2.PublicKey) (err error) {
+func WritePublicKeytoPem(FileName string, key *sm2.PublicKey) error {
 	der, err := MarshalSm2PublicKey(key)
 	if err != nil {
 		return err

x509/x509_test.go

@@ -17,7 +17,9 @@ package x509
 
 import (
 	"crypto/x509/pkix"
+	"io/ioutil"
 	"net"
+	"os"
 
 	"encoding/asn1"
 	"fmt"
@@ -32,7 +34,23 @@ func TestX509(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = WritePrivateKeytoPem("priv.pem", priv, nil) // 生成密钥文件
+
+	privPemFile, err := os.Create("priv.pem")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		err = privPemFile.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}()
+
+	certPem, err := WritePrivateKeytoPem(priv, nil) // 生成密钥文件
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = privPemFile.Write(certPem)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -41,7 +59,11 @@ func TestX509(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	privKey, err := ReadPrivateKeyFromPem("priv.pem", nil) // 读取密钥
+	privPem, err := ioutil.ReadFile("priv.pem")
+	if err != nil {
+		t.Fatal(err)
+	}
+	privKey, err := ReadPrivateKeyFromPem(privPem, nil) // 读取密钥
 	if err != nil {
 		t.Fatal(err)
 	}