ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 16:14:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unpool handshake

Browse Source 
Anyway, we are going to use stack here, no need for connection pooling.
Even arrays are allocaed on a stack because we do not use slices here
but real ones.
This commit is contained in:
9seconds
2021-03-18 22:06:52 +03:00
parent 188fa6a04a
commit 8de727932d
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mtglib/internal/obfuscated2/client_handshake.go
+15 -16
View File
@@ -1,6 +1,7 @@
package obfuscated2 package obfuscated2
import ( import (
"crypto/aes"
"crypto/cipher" "crypto/cipher"
"crypto/subtle" "crypto/subtle"
"encoding/hex" "encoding/hex"
@@ -12,41 +13,39 @@ import (
var clientHandshakeConnectionType = []byte{0xdd, 0xdd, 0xdd, 0xdd} var clientHandshakeConnectionType = []byte{0xdd, 0xdd, 0xdd, 0xdd}
func ClientHandshake(secret []byte, reader io.Reader) (int16, cipher.Stream, cipher.Stream, error) { func ClientHandshake(secret []byte, reader io.Reader) (int16, cipher.Stream, cipher.Stream, error) {
handshakeFrame := acquireHandshakeFrame() handshake := handshakeFrame{}
defer releaseHandshakeFrame(handshakeFrame)
if _, err := io.ReadFull(reader, handshakeFrame.data[:]); err != nil { if _, err := io.ReadFull(reader, handshake.data[:]); err != nil {
return 0, nil, nil, fmt.Errorf("cannot read frame: %w", err) return 0, nil, nil, fmt.Errorf("cannot read frame: %w", err)
} }
decHasher := acquireSha256Hasher() decHasher := acquireSha256Hasher()
defer releaseSha256Hasher(decHasher) defer releaseSha256Hasher(decHasher)
decHasher.Write(handshakeFrame.key()) // nolint: errcheck decHasher.Write(handshake.key()) // nolint: errcheck
decHasher.Write(secret) // nolint: errcheck decHasher.Write(secret) // nolint: errcheck
decryptor := makeAesCtr(decHasher.Sum(nil), handshakeFrame.iv()) decryptor := makeAesCtr(decHasher.Sum(nil), handshake.iv())
encHasher := acquireSha256Hasher() encHasher := acquireSha256Hasher()
defer releaseSha256Hasher(encHasher) defer releaseSha256Hasher(encHasher)
invertedFrame := acquireHandshakeFrame() invertedHandshake := handshakeFrame{}
defer releaseHandshakeFrame(invertedFrame)
for i, v := range handshakeFrame.data { for i, v := range handshake.data {
invertedFrame.data[handshakeFrameLen-1-i] = v invertedHandshake.data[handshakeFrameLen-1-i] = v
} }
encHasher.Write(invertedFrame.key()) // nolint: errcheck encHasher.Write(invertedHandshake.key()) // nolint: errcheck
encHasher.Write(secret) // nolint: errcheck encHasher.Write(secret) // nolint: errcheck
encryptor := makeAesCtr(encHasher.Sum(nil), invertedFrame.iv()) encryptor := makeAesCtr(encHasher.Sum(nil), invertedHandshake.iv())
decryptor.XORKeyStream(handshakeFrame.data[:], handshakeFrame.data[:]) decryptor.XORKeyStream(handshake.data[:], handshake.data[:])
if val := handshakeFrame.connectionType(); subtle.ConstantTimeCompare(clientHandshakeConnectionType, val) != 1 { if val := handshake.connectionType(); subtle.ConstantTimeCompare(clientHandshakeConnectionType, val) != 1 {
return 0, nil, nil, fmt.Errorf("unsupported connection type: %s", hex.EncodeToString(val)) return 0, nil, nil, fmt.Errorf("unsupported connection type: %s", hex.EncodeToString(val))
} }
return handshakeFrame.dc(), encryptor, decryptor, nil return handshake.dc(), encryptor, decryptor, nil
} }
func makeAesCtr(key, iv []byte) cipher.Stream { func makeAesCtr(key, iv []byte) cipher.Stream {
mtglib/internal/obfuscated2/pools.go
+5 -20
View File
@@ -6,18 +6,11 @@ import (
"sync" "sync"
) )
var ( var sha256HasherPool = sync.Pool{
sha256HasherPool = sync.Pool{ New: func() interface{} {
New: func() interface{} { return sha256.New()
return sha256.New() },
}, }
}
handshakeFramePool = sync.Pool{
New: func() interface{} {
return &handshakeFrame{}
},
}
)
func acquireSha256Hasher() hash.Hash { func acquireSha256Hasher() hash.Hash {
return sha256HasherPool.Get().(hash.Hash) return sha256HasherPool.Get().(hash.Hash)
@@ -27,11 +20,3 @@ func releaseSha256Hasher(h hash.Hash) {
h.Reset() h.Reset()
sha256HasherPool.Put(h) sha256HasherPool.Put(h)
} }
func acquireHandshakeFrame() *handshakeFrame {
return handshakeFramePool.Get().(*handshakeFrame)
}
func releaseHandshakeFrame(h *handshakeFrame) {
handshakeFramePool.Put(h)
}