From 7271ce6df96764a8a76203f8a23b434c665b3867 Mon Sep 17 00:00:00 2001
From: Sun Yimin <emmansun@users.noreply.github.com>
Date: Fri, 15 Jul 2022 13:34:42 +0800
Subject: [PATCH] pkcs8: find out race fail case due to big CostParameter value

---
 pkcs8/pkcs8_norace_test.go | 42 +++++++++++++++++++++
 pkcs8/pkcs8_test.go        | 77 ++++++++++++++++----------------------
 2 files changed, 75 insertions(+), 44 deletions(-)
 create mode 100644 pkcs8/pkcs8_norace_test.go

diff --git a/pkcs8/pkcs8_norace_test.go b/pkcs8/pkcs8_norace_test.go
new file mode 100644
index 0000000..6f740df
--- /dev/null
+++ b/pkcs8/pkcs8_norace_test.go
@@ -0,0 +1,42 @@
+//go:build !race
+// +build !race
+
+package pkcs8_test
+
+import (
+	"encoding/pem"
+	"testing"
+
+	"github.com/emmansun/gmsm/pkcs8"
+)
+
+// From https://tools.ietf.org/html/rfc7914
+const encryptedRFCscrypt = `-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIHiME0GCSqGSIb3DQEFDTBAMB8GCSsGAQQB2kcECzASBAVNb3VzZQIDEAAAAgEI
+AgEBMB0GCWCGSAFlAwQBKgQQyYmguHMsOwzGMPoyObk/JgSBkJb47EWd5iAqJlyy
++ni5ftd6gZgOPaLQClL7mEZc2KQay0VhjZm/7MbBUNbqOAXNM6OGebXxVp6sHUAL
+iBGY/Dls7B1TsWeGObE0sS1MXEpuREuloZjcsNVcNXWPlLdZtkSH6uwWzR0PyG/Z
++ZXfNodZtd/voKlvLOw5B3opGIFaLkbtLZQwMiGtl42AS89lZg==
+-----END ENCRYPTED PRIVATE KEY-----
+`
+
+func TestParseFFCscryptPrivateKey(t *testing.T) {
+	keyList := []struct {
+		name      string
+		clear     string
+		encrypted string
+		password  string
+	}{
+		{
+			name:      "encryptedRFCscrypt",
+			clear:     "",
+			encrypted: encryptedRFCscrypt,
+			password:  "Rabbit",
+		},
+	}
+	for i, key := range keyList {
+		t.Run(key.name, func(t *testing.T) {
+			testParsePKCS8PrivateKey(t, i, &key)
+		})
+	}
+}
diff --git a/pkcs8/pkcs8_test.go b/pkcs8/pkcs8_test.go
index 938ad06..b2425ea 100644
--- a/pkcs8/pkcs8_test.go
+++ b/pkcs8/pkcs8_test.go
@@ -8,8 +8,8 @@ import (
 	"encoding/pem"
 	"testing"
 
-	"github.com/emmansun/gmsm/sm2"
 	"github.com/emmansun/gmsm/pkcs8"
+	"github.com/emmansun/gmsm/sm2"
 )
 
 const rsa2048 = `-----BEGIN PRIVATE KEY-----
@@ -177,16 +177,6 @@ zOuhMC9Oo3oMYlbEXAT9mq33MkGKMUth2ek/bQIvnCHG
 -----END ENCRYPTED PRIVATE KEY-----
 `
 
-// From https://tools.ietf.org/html/rfc7914
-const encryptedRFCscrypt = `-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIHiME0GCSqGSIb3DQEFDTBAMB8GCSsGAQQB2kcECzASBAVNb3VzZQIDEAAAAgEI
-AgEBMB0GCWCGSAFlAwQBKgQQyYmguHMsOwzGMPoyObk/JgSBkJb47EWd5iAqJlyy
-+ni5ftd6gZgOPaLQClL7mEZc2KQay0VhjZm/7MbBUNbqOAXNM6OGebXxVp6sHUAL
-iBGY/Dls7B1TsWeGObE0sS1MXEpuREuloZjcsNVcNXWPlLdZtkSH6uwWzR0PyG/Z
-+ZXfNodZtd/voKlvLOw5B3opGIFaLkbtLZQwMiGtl42AS89lZg==
------END ENCRYPTED PRIVATE KEY-----
-`
-
 func TestParsePKCS8PrivateKeyRSA(t *testing.T) {
 	keyList := []struct {
 		name      string
@@ -266,13 +256,38 @@ func TestParsePKCS8PrivateKeyECDSA(t *testing.T) {
 	}
 }
 
+type testPrivateKey struct {
+	name      string
+	clear     string
+	encrypted string
+	password  string
+}
+
+func testParsePKCS8PrivateKey(t *testing.T, i int, key *testPrivateKey) {
+	block, _ := pem.Decode([]byte(key.encrypted))
+	_, err := pkcs8.ParsePKCS8PrivateKey(block.Bytes, []byte(key.password))
+	if err != nil {
+		t.Errorf("%d: ParsePKCS8PrivateKey returned: %s", i, err)
+	}
+	_, err = pkcs8.ParsePKCS8PrivateKey(block.Bytes, []byte("wrong password"))
+	if err == nil {
+		t.Errorf("%d: should have failed", i)
+	}
+	_, err = pkcs8.ParsePKCS8PrivateKey(block.Bytes)
+	if err == nil {
+		t.Errorf("%d: should have failed", i)
+	}
+
+	if key.clear != "" {
+		block, _ = pem.Decode([]byte(key.clear))
+		_, err = pkcs8.ParsePKCS8PrivateKey(block.Bytes)
+		if err != nil {
+			t.Errorf("%d: ParsePKCS8PrivateKey returned: %s", i, err)
+		}
+	}
+}
 func TestParsePKCS8PrivateKey(t *testing.T) {
-	keyList := []struct {
-		name      string
-		clear     string
-		encrypted string
-		password  string
-	}{
+	keyList := []testPrivateKey{
 		{
 			name:      "encryptedRSA2048aes",
 			clear:     rsa2048,
@@ -303,12 +318,6 @@ func TestParsePKCS8PrivateKey(t *testing.T) {
 			encrypted: encryptedEC256aes128sha1,
 			password:  "password",
 		},
-		{
-			name:      "encryptedRFCscrypt",
-			clear:     "",
-			encrypted: encryptedRFCscrypt,
-			password:  "Rabbit",
-		},
 		{
 			name:      "encryptedEC128aes",
 			clear:     ec128,
@@ -318,27 +327,7 @@ func TestParsePKCS8PrivateKey(t *testing.T) {
 	}
 	for i, key := range keyList {
 		t.Run(key.name, func(t *testing.T) {
-			block, _ := pem.Decode([]byte(key.encrypted))
-			_, err := pkcs8.ParsePKCS8PrivateKey(block.Bytes, []byte(key.password))
-			if err != nil {
-				t.Errorf("%d: ParsePKCS8PrivateKey returned: %s", i, err)
-			}
-			_, err = pkcs8.ParsePKCS8PrivateKey(block.Bytes, []byte("wrong password"))
-			if err == nil {
-				t.Errorf("%d: should have failed", i)
-			}
-			_, err = pkcs8.ParsePKCS8PrivateKey(block.Bytes)
-			if err == nil {
-				t.Errorf("%d: should have failed", i)
-			}
-
-			if key.clear != "" {
-				block, _ = pem.Decode([]byte(key.clear))
-				_, err = pkcs8.ParsePKCS8PrivateKey(block.Bytes)
-				if err != nil {
-					t.Errorf("%d: ParsePKCS8PrivateKey returned: %s", i, err)
-				}
-			}
+			testParsePKCS8PrivateKey(t, i, &key)
 		})
 	}
 }