修改握手时的签名算法

This commit is contained in:
lwch
2022-09-09 13:50:55 +08:00
parent 3e78c72661
commit 71410f99b2
6 changed files with 50 additions and 9 deletions
+3 -3
View File
@@ -1,11 +1,11 @@
package global
import (
"crypto/md5"
"os"
"path/filepath"
"time"
"github.com/lwch/natpass/code/hash"
"github.com/lwch/natpass/code/utils"
"github.com/lwch/runtime"
"github.com/lwch/yaml"
@@ -14,7 +14,7 @@ import (
// Configure server configure
type Configure struct {
Listen uint16
Enc [md5.Size]byte
Hasher *hash.Hasher
TLSKey string
TLSCrt string
ReadTimeout time.Duration
@@ -51,7 +51,7 @@ func LoadConf(dir string) *Configure {
}
return &Configure{
Listen: cfg.Listen,
Enc: md5.Sum([]byte(cfg.Secret)),
Hasher: hash.New(cfg.Secret, 60),
TLSKey: cfg.TLS.Key,
TLSCrt: cfg.TLS.Crt,
ReadTimeout: cfg.Link.ReadTimeout,
+1 -1
View File
@@ -91,7 +91,7 @@ func (h *Handler) readHandshake(c *network.Conn) (string, error) {
if msg.GetXType() != network.Msg_handshake {
return "", errNotHandshake
}
n := bytes.Compare(msg.GetHsp().GetEnc(), h.cfg.Enc[:])
n := bytes.Compare(msg.GetHsp().GetEnc(), h.cfg.Hasher.Hash())
if n != 0 {
return "", errInvalidHandshake
}