fixed

Author: deatil

gm/sm2/sm2.go

@@ -202,7 +202,7 @@ func (pub *PublicKey) Verify(msg, sign []byte, opts crypto.SignerOpts) bool {
     return VerifyWithRS(pub, msg, r, s, opt)
 }
 
-// 验证 asn.1 编码的数据 bytes(r + s)
+// 验证明文拼接的数据 bytes(r + s)
 // Verify Bytes marshal data bytes(r + s)
 func (pub *PublicKey) VerifyBytes(msg, sign []byte, opts crypto.SignerOpts) bool {
     r, s, err := UnmarshalSignatureBytes(pub.Curve, sign)
@@ -378,7 +378,7 @@ func (priv *PrivateKey) SignUsingK(k *big.Int, msg []byte, opts crypto.SignerOpt
     return nil, errors.New("go-cryptobin/sm2: Sign fail")
 }
 
-// 签名返回 Bytes 编码数据 bytes(r + s)
+// 签名返回明文拼接数据 bytes(r + s)
 // sign data and return Bytes marshal data bytes(r + s)
 func (priv *PrivateKey) SignBytes(random io.Reader, msg []byte, opts crypto.SignerOpts) ([]byte, error) {
     r, s, err := SignToRS(random, priv, msg, opts)
@@ -389,7 +389,7 @@ func (priv *PrivateKey) SignBytes(random io.Reader, msg []byte, opts crypto.Sign
     return MarshalSignatureBytes(priv.Curve, r, s)
 }
 
-// 签名返回 Bytes 编码数据 bytes(r + s)
+// 签名返回明文拼接数据 bytes(r + s)
 // sign data and return Bytes marshal data bytes(r + s)
 func (priv *PrivateKey) SignBytesUsingK(k *big.Int, msg []byte, opts crypto.SignerOpts) ([]byte, error) {
     r, s, err := SignUsingKToRS(k, priv, msg, opts)
@@ -731,7 +731,7 @@ func SignBytesUsingK(k *big.Int, priv *PrivateKey, msg []byte, opts crypto.Signe
     return priv.SignBytesUsingK(k, msg, opts)
 }
 
-// 验证 asn.1 编码的数据 bytes(r + s)
+// 验证明文拼接的数据 bytes(r + s)
 // Verify Bytes marshal data
 func VerifyBytes(pub *PublicKey, msg, sign []byte, opts crypto.SignerOpts) bool {
     if pub == nil {

pubkey/ecdsa/decdsa.go

@@ -14,7 +14,7 @@ import (
 
 type Hasher = func() hash.Hash
 
-type dSignature struct {
+type decdsaSignature struct {
     R, S *big.Int
 }
 
@@ -24,7 +24,7 @@ func DSignASN1(priv *ecdsa.PrivateKey, csprng io.Reader, data []byte, hashFunc H
         return nil, err
     }
 
-    return asn1.Marshal(dSignature{r, s})
+    return asn1.Marshal(decdsaSignature{r, s})
 }
 
 func DSignBytes(priv *ecdsa.PrivateKey, csprng io.Reader, data []byte, hashFunc Hasher) ([]byte, error) {

pubkey/egdsa/egdsa.go

@@ -95,7 +95,7 @@ func GenerateKey(random io.Reader, bitsize, probability int) (*PrivateKey, error
 }
 
 // r and s data
-type elgamalSignature struct {
+type egdsaSignature struct {
     R, S *big.Int
 }
 
@@ -109,7 +109,7 @@ func SignASN1(rand io.Reader, priv *PrivateKey, hash []byte) ([]byte, error) {
         return nil, err
     }
 
-    return asn1.Marshal(elgamalSignature{
+    return asn1.Marshal(egdsaSignature{
         R: r,
         S: s,
     })
@@ -118,7 +118,7 @@ func SignASN1(rand io.Reader, priv *PrivateKey, hash []byte) ([]byte, error) {
 // VerifyASN1 verifies the ASN.1 encoded signature, sig, of hash using the
 // public key, pub. Its return value records whether the signature is valid.
 func VerifyASN1(pub *PublicKey, hash, sig []byte) (bool, error) {
-    var sign elgamalSignature
+    var sign egdsaSignature
     _, err := asn1.Unmarshal(sig, &sign)
     if err != nil {
         return false, err

pubkey/elgamal/elgamal.go

@@ -457,7 +457,7 @@ func VerifyASN1(pub *PublicKey, hash, sig []byte) (bool, error) {
     return Verify(pub, hash, sign.R, sign.S)
 }
 
-// 签名返回 Bytes 编码数据
+// 签名返回明文拼接数据
 // sign data and return Bytes marshal data
 func SignBytes(rand io.Reader, priv *PrivateKey, hash []byte) ([]byte, error) {
     r, s, err := Sign(rand, priv, hash)
@@ -475,7 +475,7 @@ func SignBytes(rand io.Reader, priv *PrivateKey, hash []byte) ([]byte, error) {
     return buf, nil
 }
 
-// 验证 asn.1 编码的数据 bytes(r + s)
+// 验证明文拼接的数据 bytes(r + s)
 // Verify Bytes marshal data
 func VerifyBytes(pub *PublicKey, hash, sign []byte) (bool, error) {
     byteLen := pub.P.BitLen()

pubkey/elgamalecc/elgamalecc.go

@@ -91,14 +91,12 @@ func NewPrivateKey(curve elliptic.Curve, k []byte) (*PrivateKey, error) {
     return priv, nil
 }
 
-// 输出私钥明文
 // output PrivateKey data
 func PrivateKeyTo(key *PrivateKey) []byte {
     privateKey := make([]byte, (key.Curve.Params().N.BitLen()+7)/8)
     return key.D.FillBytes(privateKey)
 }
 
-// 根据公钥明文初始化公钥
 // New a PublicKey from publicKey data
 func NewPublicKey(curve elliptic.Curve, k []byte) (*PublicKey, error) {
     x, y := elliptic.Unmarshal(curve, k)
@@ -115,7 +113,6 @@ func NewPublicKey(curve elliptic.Curve, k []byte) (*PublicKey, error) {
     return pub, nil
 }
 
-// 输出公钥明文
 // output PublicKey data
 func PublicKeyTo(key *PublicKey) []byte {
     return elliptic.Marshal(key.Curve, key.X, key.Y)

pubkey/sdsa/sdsa.go

@@ -243,7 +243,7 @@ func GenerateKey(priv *PrivateKey, rand io.Reader) error {
 }
 
 // r and s data
-type elgamalSignature struct {
+type sdsaSignature struct {
     R, S *big.Int
 }
 
@@ -257,7 +257,7 @@ func SignASN1(rand io.Reader, priv *PrivateKey, hashFunc Hasher, data []byte) ([
         return nil, err
     }
 
-    return asn1.Marshal(elgamalSignature{
+    return asn1.Marshal(sdsaSignature{
         R: r,
         S: s,
     })
@@ -266,7 +266,7 @@ func SignASN1(rand io.Reader, priv *PrivateKey, hashFunc Hasher, data []byte) ([
 // VerifyASN1 verifies the ASN.1 encoded signature, sig, of hash using the
 // public key, pub. Its return value records whether the signature is valid.
 func VerifyASN1(pub *PublicKey, hashFunc Hasher, data []byte, sig []byte) (bool, error) {
-    var sign elgamalSignature
+    var sign sdsaSignature
     _, err := asn1.Unmarshal(sig, &sign)
     if err != nil {
         return false, err