Well, performance is not so high actually

[govpn.git] / handshake.go

diff --git a/handshake.go b/handshake.go
index 072a7bd5be7424c1ae2bbe6551278f434f2f27e2..6f948b5b440178e3cda5108723a273e5ad7713b0 100644 (file)
--- a/handshake.go
+++ b/handshake.go
@@ -1,5 +1,5 @@
 /*
-govpn -- high-performance secure virtual private network daemon
+govpn -- Simple secure virtual private network daemon
 Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -15,6 +15,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 package main
 
 import (
@@ -25,10 +26,10 @@ import (
        "net"
        "time"
 
-       "code.google.com/p/go.crypto/curve25519"
-       "code.google.com/p/go.crypto/poly1305"
-       "code.google.com/p/go.crypto/salsa20"
-       "code.google.com/p/go.crypto/salsa20/salsa"
+       "golang.org/x/crypto/curve25519"
+       "golang.org/x/crypto/poly1305"
+       "golang.org/x/crypto/salsa20"
+       "golang.org/x/crypto/salsa20/salsa"
 )
 
 type Handshake struct {
@@ -77,10 +78,6 @@ func dhPrivGen() *[32]byte {
        if _, err := rand.Read(dh[:]); err != nil {
                panic("Can not read random for DH private key")
        }
-       // This bitwise operations are required by Curve25519 whitepaper
-       dh[0] = dh[0] & (255 - 128 - 64 - 32) // clear first three bits
-       dh[31] = dh[31] & (255 - 1)           // clear last bit
-       dh[31] = dh[31] | 2                   // set pre-last bit
        return dh
 }
 
@@ -115,7 +112,7 @@ func HandshakeStart(conn *net.UDPConn, addr *net.UDPAddr, key *[32]byte) *Handsh
        return &state
 }
 
-func (h *Handshake) Server(conn *net.UDPConn, key *[32]byte, data []byte) *Peer {
+func (h *Handshake) Server(noncediff uint64, conn *net.UDPConn, key *[32]byte, data []byte) *Peer {
        switch len(data) {
        case 56: // R + ENC(PSK, dh_client_pub) + NULLs
                fmt.Print("[HS1]")
@@ -183,7 +180,11 @@ func (h *Handshake) Server(conn *net.UDPConn, key *[32]byte, data []byte) *Peer
                }
 
                // Switch peer
-               peer := Peer{addr: h.addr, nonceOur: 0, nonceRecv: 0}
+               peer := Peer{
+                       addr: h.addr,
+                       nonceOur: noncediff + 0,
+                       nonceRecv: noncediff + 0,
+               }
                peer.key = KeyFromSecrets(h.sServer[:], decRs[8+8:])
                fmt.Print("[OK]")
                return &peer
@@ -193,7 +194,7 @@ func (h *Handshake) Server(conn *net.UDPConn, key *[32]byte, data []byte) *Peer
        return nil
 }
 
-func (h *Handshake) Client(conn *net.UDPConn, key *[32]byte, data []byte) *Peer {
+func (h *Handshake) Client(noncediff uint64, conn *net.UDPConn, key *[32]byte, data []byte) *Peer {
        switch len(data) {
        case 88: // ENC(PSK, dh_server_pub) + ENC(K, RS + SS) + NULLs
                fmt.Print("[HS2]")
@@ -250,7 +251,11 @@ func (h *Handshake) Client(conn *net.UDPConn, key *[32]byte, data []byte) *Peer
                }
 
                // Switch peer
-               peer := Peer{addr: h.addr, nonceOur: 1, nonceRecv: 0}
+               peer := Peer{
+                       addr: h.addr,
+                       nonceOur: noncediff + 1,
+                       nonceRecv: noncediff + 0,
+               }
                peer.key = KeyFromSecrets(h.sServer[:], h.sClient[:])
                fmt.Print("[OK]")
                return &peer