mirror/gmsm
1
0
Fork 0
mirror of https://github.com/emmansun/gmsm.git synced 2025-04-26 12:16:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

sm2: fix RecoverPublicKeysFromSM2Signature

Browse Source
This commit is contained in:
Sun Yimin 2024-08-13 13:34:51 +08:00 committed by GitHub
parent 4c7cf989c7
commit 4517d00cc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sm2/sm2.go
View File

@ -762,7 +762,7 @@ func RecoverPublicKeysFromSM2Signature(hash, sig []byte) ([]*ecdsa.PublicKey, er
pointRx = append(pointRx, s) pointRx = append(pointRx, s)
} }
pubs := make([]*ecdsa.PublicKey, 0, 4) pubs := make([]*ecdsa.PublicKey, 0, 4)
bytes := make([]byte, len(rBytes)+1) bytes := make([]byte, len(32)+1)
compressFlags := []byte{compressed02, compressed03} compressFlags := []byte{compressed02, compressed03}
// Rx has one or two possible values, so point R has two or four possible values // Rx has one or two possible values, so point R has two or four possible values
for _, x := range pointRx { for _, x := range pointRx {

35
sm2/sm2_test.go
View File

@ -470,8 +470,7 @@ func TestSignVerify(t *testing.T) {
} }
} }
func TestRecoverPublicKeysFromSM2Signature(t *testing.T) { func testRecoverPublicKeysFromSM2Signature(t *testing.T, priv *PrivateKey) {
priv, _ := GenerateKey(rand.Reader)
tests := []struct { tests := []struct {
name string name string
plainText string plainText string
@ -511,6 +510,38 @@ func TestRecoverPublicKeysFromSM2Signature(t *testing.T) {
} }
} }
func TestRecoverPublicKeysFromSM2Signature(t *testing.T) {
priv, _ := GenerateKey(rand.Reader)
testRecoverPublicKeysFromSM2Signature(t, priv)
keyInt := bigFromHex("d6833540d019e0438a5dd73b414f26ab43d8064b99671206944e284dbd969093")
priv, _ = NewPrivateKeyFromInt(keyInt)
testRecoverPublicKeysFromSM2Signature(t, priv)
// failed case
hashValue, _ := CalculateSM2Hash(&priv.PublicKey, []byte("encryption standard encryption "), nil)
signature, _ := hex.DecodeString("3045022000cd0b56bf6be810032d28ff27d6f3468f1f1a09bcf8581f30a5de6692c85ea602210096ba29c086134af1be139dd572f2f2908f30e01fd0c28e06a687cbb0ff6e33ce")
// verify signature with public key
if !VerifyASN1(&priv.PublicKey, hashValue, signature) {
t.Errorf("failed to verify hash for sig=%x, priv=%x", signature, priv.D.Bytes())
}
pubs, err := RecoverPublicKeysFromSM2Signature(hashValue, signature)
if err != nil {
t.Fatalf("recover failed %v", err)
}
found := false
for _, pub := range pubs {
if !VerifyASN1(pub, hashValue, signature) {
t.Errorf("failed to verify hash for sig=%x, priv=%x", signature, priv.D.Bytes())
}
if pub.Equal(&priv.PublicKey) {
found = true
}
}
if !found {
t.Errorf("recover failed, not found public key for sig=%x, priv=%x", signature, priv.D.Bytes())
}
}
func TestSignVerifyLegacy(t *testing.T) { func TestSignVerifyLegacy(t *testing.T) {
priv, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) priv, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
tests := []struct { tests := []struct {