guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from fatedier/test

Browse Source
This commit is contained in:
fatedier 2016-04-05 15:43:28 +08:00
commit 78c770d37d
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/frp/utils/pcrypto/pcrypto.go
View File

@ -40,21 +40,27 @@ func (pc *Pcrypto) Init(key []byte) error {
} }
func (pc *Pcrypto) Encrypt(src []byte) ([]byte, error) { func (pc *Pcrypto) Encrypt(src []byte) ([]byte, error) {
// gzip
var zbuf bytes.Buffer
zwr, err := gzip.NewWriterLevel(&zbuf, -1)
if err != nil {
return nil, err
}
defer zwr.Close()
zwr.Write(src)
zwr.Flush()
fmt.Println("com,src,en", len(src), len(zbuf.Bytes()))
// aes // aes
src = pKCS7Padding(src, aes.BlockSize) src = pKCS7Padding(zbuf.Bytes(), aes.BlockSize)
blockMode := cipher.NewCBCEncrypter(pc.paes, pc.pkey) blockMode := cipher.NewCBCEncrypter(pc.paes, pc.pkey)
crypted := make([]byte, len(src)) crypted := make([]byte, len(src))
blockMode.CryptBlocks(crypted, src) blockMode.CryptBlocks(crypted, src)
// gzip fmt.Println("aes,src,en", len(src), len(crypted))
var zbuf bytes.Buffer
zwr := gzip.NewWriter(&zbuf)
defer zwr.Close()
zwr.Write(crypted)
zwr.Flush()
// base64 // base64
return []byte(base64.StdEncoding.EncodeToString(zbuf.Bytes())), nil return []byte(base64.StdEncoding.EncodeToString(crypted)), nil
} }
func (pc *Pcrypto) Decrypt(str []byte) ([]byte, error) { func (pc *Pcrypto) Decrypt(str []byte) ([]byte, error) {
@ -64,12 +70,6 @@ func (pc *Pcrypto) Decrypt(str []byte) ([]byte, error) {
return nil, err return nil, err
} }
// gunzip
zbuf := bytes.NewBuffer(data)
zrd, _ := gzip.NewReader(zbuf)
defer zrd.Close()
data, _ = ioutil.ReadAll(zrd)
// aes // aes
decryptText, err := hex.DecodeString(fmt.Sprintf("%x", data)) decryptText, err := hex.DecodeString(fmt.Sprintf("%x", data))
if err != nil { if err != nil {
@ -85,7 +85,13 @@ func (pc *Pcrypto) Decrypt(str []byte) ([]byte, error) {
blockMode.CryptBlocks(decryptText, decryptText) blockMode.CryptBlocks(decryptText, decryptText)
decryptText = pKCS7UnPadding(decryptText) decryptText = pKCS7UnPadding(decryptText)
return decryptText, nil // gunzip
zbuf := bytes.NewBuffer(decryptText)
zrd, _ := gzip.NewReader(zbuf)
defer zrd.Close()
data, _ = ioutil.ReadAll(zrd)
return data, nil
} }
func pKCS7Padding(ciphertext []byte, blockSize int) []byte { func pKCS7Padding(ciphertext []byte, blockSize int) []byte {