support kcdsa validation parameters in kx509

RyuaNerin · Jan 25, 2024 · 6c2c1ed · 6c2c1ed
1 parent 3c17380
commit 6c2c1ed
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 1 deletion.
diff --git a/kcdsa/key.go b/kcdsa/key.go
@@ -2,6 +2,7 @@ package kcdsa
 
 import (
 	"crypto"
+	"crypto/subtle"
 	"math/big"
 
 	"github.com/RyuaNerin/go-krypto/internal"
@@ -56,8 +57,15 @@ func (pub *PublicKey) Equal(x crypto.PublicKey) bool {
 }
 
 // Equal reports whether p, q, g and sizes have the same value.
-func (params *Parameters) Equal(xx Parameters) bool {
+func (params Parameters) Equal(xx Parameters) bool {
 	return internal.BigIntEqual(params.P, xx.P) &&
 		internal.BigIntEqual(params.Q, xx.Q) &&
 		internal.BigIntEqual(params.G, xx.G)
 }
+
+// Equal reports whether p, q, g and sizes have the same value.
+func (params *TTAKParameters) Equal(xx TTAKParameters) bool {
+	return internal.BigIntEqual(params.J, xx.J) &&
+		subtle.ConstantTimeEq(int32(params.Count), int32(xx.Count)) == 1 &&
+		subtle.ConstantTimeCompare(params.Seed, xx.Seed) == 1
+}
diff --git a/kx509/pkcs8.go b/kx509/pkcs8.go
@@ -73,6 +73,11 @@ func ParsePKCS8PrivateKey(der []byte) (key interface{}, err error) {
 					Q: params.Q,
 					G: params.G,
 					// TODO: Read KCDSA Parameters J, Seed, Count
+					TTAKParams: kcdsa.TTAKParameters{
+						J:     params.J,
+						Seed:  params.Seed,
+						Count: params.Count,
+					},
 				},
 			},
 		}
@@ -115,6 +120,9 @@ func marshalPKCS8PrivateKeyKCDSA(privKey *pkcs8, k *kcdsa.PrivateKey) error {
 		Q: k.Q,
 		G: k.G,
 		// TODO: Read KCDSA Parameters J, Seed, Count
+		J:     k.TTAKParams.J,
+		Seed:  k.TTAKParams.Seed,
+		Count: k.TTAKParams.Count,
 	})
 	if err != nil {
 		return errors.New("kx509: invalid paramerter")

diff --git a/kx509/pkcs8_test.go b/kx509/pkcs8_test.go
@@ -57,4 +57,35 @@ func TestMarshalAndParsePKCS8PrivateKey(t *testing.T) {
 			}
 		}
 	})
+	t.Run("KCDSA-TTAK", func(t *testing.T) {
+		for _, size := range sizeList {
+			var p1 kcdsa.PrivateKey
+
+			_ = kcdsa.GenerateParametersTTAK(&p1.Parameters, rand.Reader, size)
+			_ = kcdsa.GenerateKey(&p1, rand.Reader)
+
+			der, err := MarshalPKCS8PrivateKey(&p1)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+
+			p2r, err := ParsePKCS8PrivateKey(der)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+
+			p2, ok := p2r.(*kcdsa.PrivateKey)
+			if !ok {
+				t.Error("type error")
+				return
+			}
+
+			if !p1.Equal(p2) || !p1.TTAKParams.Equal(p2.TTAKParams) {
+				t.Error("not equals!")
+				return
+			}
+		}
+	})
 }
diff --git a/kx509/pkix.go b/kx509/pkix.go
@@ -71,6 +71,9 @@ func marshalPublicKey(pub interface{}) (publicKeyBytes []byte, publicKeyAlgorith
 			Q: pub.Q,
 			G: pub.G,
 			// TODO: Read KCDSA Parameters J, Seed, Count
+			J:     pub.TTAKParams.J,
+			Seed:  pub.TTAKParams.Seed,
+			Count: pub.TTAKParams.Count,
 		})
 		if err != nil {
 			return nil, pkix.AlgorithmIdentifier{}, errors.New("kx509: invalid paramerter")
@@ -195,6 +198,21 @@ func parsePublicKey(keyData *publicKeyInfo) (interface{}, error) {
 			pub.Parameters.Q.Sign() <= 0 || pub.Parameters.G.Sign() <= 0 {
 			return nil, errors.New("kx509: zero or negative KCDSA parameter")
 		}
+
+		// TODO: Read KCDSA Parameters J, Seed, Count
+		J := new(big.Int)
+		seed := make([]byte, 32)
+		var count int
+		if paramsDer.ReadASN1Integer(J) &&
+			paramsDer.ReadASN1Bytes(&seed, cryptobyte_asn1.OCTET_STRING) &&
+			paramsDer.ReadASN1Integer(&count) {
+			pub.Parameters.TTAKParams = kcdsa.TTAKParameters{
+				J:     J,
+				Seed:  seed,
+				Count: count,
+			}
+		}
+
 		return pub, nil
 
 	default:

diff --git a/kx509/pkix_test.go b/kx509/pkix_test.go
@@ -59,4 +59,37 @@ func TestMarshalAndParsePKIXPublicKey(t *testing.T) {
 			}
 		}
 	})
+	t.Run("KCDSA-TTAK", func(t *testing.T) {
+		for _, size := range sizeList {
+			var p1p kcdsa.PrivateKey
+
+			_ = kcdsa.GenerateParametersTTAK(&p1p.Parameters, rand.Reader, size)
+			_ = kcdsa.GenerateKey(&p1p, rand.Reader)
+
+			p1 := &p1p.PublicKey
+
+			der, err := MarshalPKIXPublicKey(p1)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+
+			p2r, err := ParsePKIXPublicKey(der)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+
+			p2, ok := p2r.(*kcdsa.PublicKey)
+			if !ok {
+				t.Error("type error")
+				return
+			}
+
+			if !p1.Equal(p2) || !p1.TTAKParams.Equal(p2.TTAKParams) {
+				t.Error("not equals!")
+				return
+			}
+		}
+	})
 }