更新

Author: deatil

gm/sm2/marshal.go

@@ -142,7 +142,7 @@ func unmarshalCipherASN1(curve elliptic.Curve, data []byte, mode Mode) (encrypte
 type cipherASN1New struct {
     XCoordinate *big.Int
     YCoordinate *big.Int
-    HASH        []byte
+    Hash        []byte
     CipherText  []byte
 }
 
@@ -152,7 +152,7 @@ func marshalCipherASN1New(data encryptedData) ([]byte, error) {
     return asn1.Marshal(cipherASN1New{
         XCoordinate: bytesToBigInt(data.XCoordinate),
         YCoordinate: bytesToBigInt(data.YCoordinate),
-        HASH:        data.Hash,
+        Hash:        data.Hash,
         CipherText:  data.CipherText,
     })
 }
@@ -171,7 +171,7 @@ func unmarshalCipherASN1New(curve elliptic.Curve, b []byte) (encryptedData, erro
     return encryptedData{
         XCoordinate: x, // x分量
         YCoordinate: y, // y分量
-        Hash:        data.HASH,       // hash
+        Hash:        data.Hash,       // hash
         CipherText:  data.CipherText, // cipherText
     }, nil
 }
@@ -181,7 +181,7 @@ type cipherASN1Old struct {
     XCoordinate *big.Int
     YCoordinate *big.Int
     CipherText  []byte
-    HASH        []byte
+    Hash        []byte
 }
 
 // sm2 密文转 asn.1 编码格式
@@ -191,7 +191,7 @@ func marshalCipherASN1Old(data encryptedData) ([]byte, error) {
         XCoordinate: bytesToBigInt(data.XCoordinate),
         YCoordinate: bytesToBigInt(data.YCoordinate),
         CipherText:  data.CipherText,
-        HASH:        data.Hash,
+        Hash:        data.Hash,
     })
 }
 
@@ -210,7 +210,7 @@ func unmarshalCipherASN1Old(curve elliptic.Curve, b []byte) (encryptedData, erro
         XCoordinate: x, // x分量
         YCoordinate: y, // y分量
         CipherText:  data.CipherText, // cipherText
-        Hash:        data.HASH,       // hash
+        Hash:        data.Hash,       // hash
     }, nil
 }
 

pubkey/bip0340/bip0340.go

@@ -22,6 +22,7 @@ const (
 var (
     ErrPrivateKey         = errors.New("go-cryptobin/bip0340: invalid PrivateKey")
     ErrParametersNotSetUp = errors.New("go-cryptobin/bip0340: parameters not set up before generating key")
+    ErrInvalidK           = errors.New("go-cryptobin/bip0340: use another K")
     ErrInvalidASN1        = errors.New("go-cryptobin/bip0340: invalid ASN.1")
     ErrInvalidSignerOpts  = errors.New("go-cryptobin/bip0340: opts must be *SignerOpts")
 )
@@ -270,12 +271,18 @@ func SignToRS(random io.Reader, priv *PrivateKey, hashFunc Hasher, msg []byte) (
     e := new(big.Int).Set(one)
     e.Lsh(e, 8 * uint(qlen))
 
+Retry:
     k, err := rand.Int(random, e)
     if err != nil {
         return
     }
 
-    return SignUsingKToRS(k, priv, hashFunc, msg)
+    r, s, err = SignUsingKToRS(k, priv, hashFunc, msg)
+    if err == ErrInvalidK {
+        goto Retry
+    }
+
+    return
 }
 
 // sign with k
@@ -309,7 +316,6 @@ func SignUsingKToRS(k *big.Int, priv *PrivateKey, hashFunc Hasher, msg []byte) (
     /* Adjust d depending on public key y */
     bip0340SetScalar(d, n, py)
 
-Retry:
     sig := make([]byte, qlen)
     k.FillBytes(sig)
 
@@ -344,7 +350,7 @@ Retry:
     k.Mod(k, n)
 
     if k.Cmp(zero) == 0 {
-        goto Retry
+        return nil, nil, ErrInvalidK
     }
 
     kGx, kGy := curve.ScalarBaseMult(k.Bytes())

pubkey/ecies/ecies.go

@@ -19,17 +19,17 @@ import (
 )
 
 var (
-    ErrInvalidCurve               = fmt.Errorf("ecies: invalid elliptic curve")
-    ErrInvalidParams              = fmt.Errorf("ecies: invalid ECIES parameters")
-    ErrInvalidPublicKey           = fmt.Errorf("ecies: invalid public key")
-    ErrInvalidPrivateKey          = fmt.Errorf("ecies: invalid private key")
-    ErrSharedKeyIsPointAtInfinity = fmt.Errorf("ecies: shared key is point at infinity")
-    ErrSharedKeyTooBig            = fmt.Errorf("ecies: shared key params are too big")
-    ErrUnsupportedECIESParameters = fmt.Errorf("ecies: unsupported ECIES parameters")
-
-    ErrKeyDataTooLong = fmt.Errorf("ecies: can't supply requested key data")
-    ErrSharedTooLong  = fmt.Errorf("ecies: shared secret is too long")
-    ErrInvalidMessage = fmt.Errorf("ecies: invalid message")
+    ErrInvalidCurve               = fmt.Errorf("go-cryptobin/ecies: invalid elliptic curve")
+    ErrInvalidParams              = fmt.Errorf("go-cryptobin/ecies: invalid ECIES parameters")
+    ErrInvalidPublicKey           = fmt.Errorf("go-cryptobin/ecies: invalid public key")
+    ErrInvalidPrivateKey          = fmt.Errorf("go-cryptobin/ecies: invalid private key")
+    ErrSharedKeyIsPointAtInfinity = fmt.Errorf("go-cryptobin/ecies: shared key is point at infinity")
+    ErrSharedKeyTooBig            = fmt.Errorf("go-cryptobin/ecies: shared key params are too big")
+    ErrUnsupportedECIESParameters = fmt.Errorf("go-cryptobin/ecies: unsupported ECIES parameters")
+
+    ErrKeyDataTooLong = fmt.Errorf("go-cryptobin/ecies: can't supply requested key data")
+    ErrSharedTooLong  = fmt.Errorf("go-cryptobin/ecies: shared secret is too long")
+    ErrInvalidMessage = fmt.Errorf("go-cryptobin/ecies: invalid message")
 )
 
 type ECIESParams struct {
@@ -90,9 +90,9 @@ func AddParamsFromCurve(curve elliptic.Curve, ecie *ECIESParams) {
 
 // PublicKey is a representation of an elliptic curve public key.
 type PublicKey struct {
-    X *big.Int
-    Y *big.Int
     elliptic.Curve
+
+    X, Y *big.Int
     Params *ECIESParams
 }
 
@@ -118,6 +118,7 @@ func ImportECDSAPublicKey(pub *ecdsa.PublicKey) *PublicKey {
 // PrivateKey is a representation of an elliptic curve private key.
 type PrivateKey struct {
     PublicKey
+
     D *big.Int
 }
 
@@ -298,8 +299,6 @@ func (priv *PrivateKey) Decrypt(c, s1, s2 []byte) (m []byte, err error) {
     return
 }
 
-// =================================
-
 // Encrypt encrypts a message using ECIES as specified in SEC 1, 5.1.
 //
 // s1 and s2 contain shared information that is not part of the resulting

x509/csr_enveloped.go

@@ -69,7 +69,7 @@ type SM2EnvelopedKey struct {
 type SM2EncryptedKey struct {
     XCoordinate *big.Int
     YCoordinate *big.Int
-    HASH        []byte
+    Hash        []byte
     CipherText  []byte
 }