fix

diff --git a/crypto/EasyCrypt.go b/crypto/EasyCrypt.go
index 5cc18f7788bc6863a7b98676f80897c9739ef183..3502163a9fcb0113a90e84b134a073cbcc44261a 100644 (file)
--- a/crypto/EasyCrypt.go
+++ b/crypto/EasyCrypt.go
@@ -3,47 +3,54 @@ package part
 import (
        "bytes"
        "errors"
-       p "github.com/qydysky/part"
+
+       ps "github.com/qydysky/part/strings"
 )
 
-func Encrypt(source,pubKey []byte) ([]byte,error) {
+func Encrypt(source, pubKey []byte) ([]byte, error) {
        var c Crypto
-       if e := c.GetPKIXPubKey(pubKey);e != nil{return []byte{},e}
+       if e := c.GetPKIXPubKey(pubKey); e != nil {
+               return []byte{}, e
+       }
 
-       key := p.Stringf().Rand(2,32)
+       key := ps.Rand(ps.UppNumber, 32)
 
        var g Gcm
-       if e := g.Init(key);e != nil {return []byte{},e}
+       if e := g.Init(key); e != nil {
+               return []byte{}, e
+       }
 
-       if S_body,e := g.Encrypt(source);e != nil{
-               return []byte{},e
-       } else if S_key,e := c.GetEncrypt([]byte(key));e != nil {
-               return []byte{},e
+       if S_body, e := g.Encrypt(source); e != nil {
+               return []byte{}, e
+       } else if S_key, e := c.GetEncrypt([]byte(key)); e != nil {
+               return []byte{}, e
        } else {
-               return append(S_key,append([]byte(`  `),S_body...)...),nil
+               return append(S_key, append([]byte(`  `), S_body...)...), nil
        }
 }
 
-func Decrypt(source,priKey []byte) ([]byte,error) {
+func Decrypt(source, priKey []byte) ([]byte, error) {
        var loc = -1
-       if loc = bytes.Index(source, []byte(`  `));loc == -1{
-               return []byte{},errors.New(`not easyCrypt type`)
+       if loc = bytes.Index(source, []byte(`  `)); loc == -1 {
+               return []byte{}, errors.New(`not easyCrypt type`)
        }
 
        S_key := source[:loc]
        S_body := source[loc+2:]
 
        var c Crypto
-       if e := c.GetPKCS1PriKey(priKey);e != nil{return []byte{},e}
+       if e := c.GetPKCS1PriKey(priKey); e != nil {
+               return []byte{}, e
+       }
 
        var g Gcm
-       if key,e := c.GetDecrypt(S_key);e != nil {
-               return []byte{},e
-       } else if e := g.Init(string(key));e != nil {
-               return []byte{},e
-       } else if body,e := g.Decrypt(S_body);e != nil{
-               return []byte{},e
+       if key, e := c.GetDecrypt(S_key); e != nil {
+               return []byte{}, e
+       } else if e := g.Init(string(key)); e != nil {
+               return []byte{}, e
+       } else if body, e := g.Decrypt(S_body); e != nil {
+               return []byte{}, e
        } else {
-               return body,nil
+               return body, nil
        }
-}
\ No newline at end of file
+}

diff --git a/strings/Strings.go b/strings/Strings.go
index 6838d2aa06868cafa245236722cd9e4d48e2ae1a..285e715e8fcd8a8bbc840c71ec53aa13cbe40ad5 100644 (file)
--- a/strings/Strings.go
+++ b/strings/Strings.go
@@ -10,8 +10,8 @@ import (
 
 const (
        Number    RandType = 0
-       lowNumber RandType = 1
-       uppNumber RandType = 2
+       LowNumber RandType = 1
+       UppNumber RandType = 2
 )
 
 type RandType int

diff --git a/strings/Strings_test.go b/strings/Strings_test.go
index 2d070f9c163bcbe281bcc57f3881badf355f8fe8..547194b039cb798e5f542555c89d4fdd796a46fd 100644 (file)
--- a/strings/Strings_test.go
+++ b/strings/Strings_test.go
@@ -6,8 +6,8 @@ import (
 
 func Test_Rand(t *testing.T) {
        t.Log(Rand(Number, 14))
-       t.Log(Rand(lowNumber, 14))
-       t.Log(Rand(uppNumber, 14))
+       t.Log(Rand(LowNumber, 14))
+       t.Log(Rand(UppNumber, 14))
 }
 
 func Test_UnescapeUnicode(t *testing.T) {