X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fgovpn%2Fhandshake.go;h=0aa65bd624e4e9366db2275b3acff5d6fc04ad1d;hb=0c6f6e443c37addce07cb3d1cd337c62a234e90d;hp=1c7c43d6fd83dac0de0f7483fca7840b868adeee;hpb=71c54b2c70a7a63e9a0f1009319c98f253a8fe10;p=govpn.git

diff --git a/src/govpn/handshake.go b/src/govpn/handshake.go
index 1c7c43d..0aa65bd 100644
--- a/src/govpn/handshake.go
+++ b/src/govpn/handshake.go
@@ -171,7 +171,7 @@ func HandshakeStart(addr string, conn io.Writer, conf *PeerConf) *Handshake {
 		log.Fatalln("Error reading random for nonce:", err)
 	}
 	var enc []byte
-	if conf.NoiseEnable {
+	if conf.Noise {
 		enc = make([]byte, MTU-xtea.BlockSize-RSize)
 	} else {
 		enc = make([]byte, 32)
@@ -224,7 +224,7 @@ func (h *Handshake) Server(data []byte) *Peer {
 			log.Fatalln("Error reading random for S:", err)
 		}
 		var encRs []byte
-		if h.Conf.NoiseEnable {
+		if h.Conf.Noise {
 			encRs = make([]byte, MTU-len(encPub)-xtea.BlockSize)
 		} else {
 			encRs = make([]byte, RSize+SSize)
@@ -259,7 +259,7 @@ func (h *Handshake) Server(data []byte) *Peer {
 
 		// Send final answer to client
 		var enc []byte
-		if h.Conf.NoiseEnable {
+		if h.Conf.Noise {
 			enc = make([]byte, MTU-xtea.BlockSize)
 		} else {
 			enc = make([]byte, RSize)
@@ -318,7 +318,7 @@ func (h *Handshake) Client(data []byte) *Peer {
 		sign := ed25519.Sign(h.Conf.DSAPriv, h.key[:])
 
 		var enc []byte
-		if h.Conf.NoiseEnable {
+		if h.Conf.Noise {
 			enc = make([]byte, MTU-xtea.BlockSize)
 		} else {
 			enc = make([]byte, RSize+RSize+SSize+ed25519.SignatureSize)