Revert "Don't use modules"

This reverts commit bffe99aeadae09abd02f2bd3184925af6b680535.

diff --git a/cookie.go b/cookie.go
index 95729019d556342edde90ac219ecf40e9de081e1..72455a46f05cdf5d4343cec787a553aa7f2c339d 100644 (file)
--- a/cookie.go
+++ b/cookie.go
@@ -3,6 +3,7 @@ package main
 import (
        "crypto/hmac"
        "crypto/rand"
+       "git.zx2c4.com/wireguard-go/internal/xchacha20poly1305"
        "golang.org/x/crypto/blake2s"
        "golang.org/x/crypto/chacha20poly1305"
        "sync"
@@ -157,7 +158,7 @@ func (st *CookieChecker) CreateReply(
                return nil, err
        }
 
-       XChaCha20Poly1305Encrypt(
+       xchacha20poly1305.Encrypt(
                reply.Cookie[:0],
                &reply.Nonce,
                cookie[:],
@@ -201,7 +202,7 @@ func (st *CookieGenerator) ConsumeReply(msg *MessageCookieReply) bool {
 
        var cookie [blake2s.Size128]byte
 
-       _, err := XChaCha20Poly1305Decrypt(
+       _, err := xchacha20poly1305.Decrypt(
                cookie[:0],
                &msg.Nonce,
                msg.Cookie[:],

diff --git a/device.go b/device.go
index 632494889760ab3d4b520c2c6d8789fd0df8df71..9f93f2144b8e19a4e64d8080fd436bd02ed1ccf2 100644 (file)
--- a/device.go
+++ b/device.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+       "git.zx2c4.com/wireguard-go/internal/ratelimiter"
        "runtime"
        "sync"
        "sync/atomic"
@@ -50,7 +51,7 @@ type Device struct {
 
        rate struct {
                underLoadUntil atomic.Value
-               limiter        Ratelimiter
+               limiter        ratelimiter.Ratelimiter
        }
 
        pool struct {

diff --git a/ratelimiter.go b/internal/ratelimiter/ratelimiter.go
similarity index 99%
rename from ratelimiter.go
rename to internal/ratelimiter/ratelimiter.go
index 168a743e49d02f328fa9550986edbdce637ad762..006900a647b601f4d4abf22d6722f05efc88c1cc 100644 (file)
--- a/ratelimiter.go
+++ b/internal/ratelimiter/ratelimiter.go
@@ -1,4 +1,4 @@
-package main
+package ratelimiter
 
 /* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
 

diff --git a/ratelimiter_test.go b/internal/ratelimiter/ratelimiter_test.go
similarity index 99%
rename from ratelimiter_test.go
rename to internal/ratelimiter/ratelimiter_test.go
index 9b0abfdcb3c8e541384170b2ff29132d48b01b24..37339ee296edceb916d7538791ade2557c7c2dc8 100644 (file)
--- a/ratelimiter_test.go
+++ b/internal/ratelimiter/ratelimiter_test.go
@@ -1,4 +1,4 @@
-package main
+package ratelimiter
 
 import (
        "net"

diff --git a/tai64n.go b/internal/tai64n/tai64n.go
similarity index 91%
rename from tai64n.go
rename to internal/tai64n/tai64n.go
index 8c5ebe0d9de499e4fc05304484288a0b39717fa4..da5257c1f7ff700c5ce1699b7e1e45592c6cdd09 100644 (file)
--- a/tai64n.go
+++ b/internal/tai64n/tai64n.go
@@ -1,4 +1,4 @@
-package main
+package tai64n
 
 import (
        "bytes"
@@ -11,7 +11,7 @@ const base = uint64(4611686018427387914)
 
 type Timestamp [TimestampSize]byte
 
-func TimestampNow() Timestamp {
+func Now() Timestamp {
        var tai64n Timestamp
        now := time.Now()
        secs := base + uint64(now.Unix())

diff --git a/tai64n_test.go b/internal/tai64n/tai64n_test.go
similarity index 84%
rename from tai64n_test.go
rename to internal/tai64n/tai64n_test.go
index a9e22b046642b92165469c16f5a0e4b182ee7156..389b65cd961aba093b23c3057f13dafa6a12f078 100644 (file)
--- a/tai64n_test.go
+++ b/internal/tai64n/tai64n_test.go
@@ -1,4 +1,4 @@
-package main
+package tai64n
 
 import (
        "testing"
@@ -9,10 +9,10 @@ import (
  * as used by WireGuard.
  */
 func TestMonotonic(t *testing.T) {
-       old := TimestampNow()
+       old := Now()
        for i := 0; i < 10000; i++ {
                time.Sleep(time.Nanosecond)
-               next := TimestampNow()
+               next := Now()
                if !next.After(old) {
                        t.Error("TAI64N, not monotonically increasing on nano-second scale")
                }

diff --git a/xchacha20.go b/internal/xchacha20poly1305/xchacha20.go
similarity index 98%
rename from xchacha20.go
rename to internal/xchacha20poly1305/xchacha20.go
index 8e7d99fcaa1df11739bf2930691a77b8001a9073..a6e59f0cf990d3712aa5c25639a3b2916c37813a 100644 (file)
--- a/xchacha20.go
+++ b/internal/xchacha20poly1305/xchacha20.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a license that can be
 // found in the LICENSE file.
 
-package main
+package xchacha20poly1305
 
 import (
        "encoding/binary"
@@ -138,7 +138,7 @@ func hChaCha20(out *[32]byte, nonce []byte, key *[32]byte) {
        binary.LittleEndian.PutUint32(out[28:], v15)
 }
 
-func XChaCha20Poly1305Encrypt(
+func Encrypt(
        dst []byte,
        nonceFull *[24]byte,
        plaintext []byte,
@@ -153,7 +153,7 @@ func XChaCha20Poly1305Encrypt(
        return aead.Seal(dst, nonce[:], plaintext, additionalData)
 }
 
-func XChaCha20Poly1305Decrypt(
+func Decrypt(
        dst []byte,
        nonceFull *[24]byte,
        plaintext []byte,

diff --git a/xchacha20_test.go b/internal/xchacha20poly1305/xchacha20_test.go
similarity index 96%
rename from xchacha20_test.go
rename to internal/xchacha20poly1305/xchacha20_test.go
index 0f41cf8c799fe3581db7206fcbe84c79e47b7859..5d5b78fd2a548b46709032145a9ba639076e26f9 100644 (file)
--- a/xchacha20_test.go
+++ b/internal/xchacha20poly1305/xchacha20_test.go
@@ -1,4 +1,4 @@
-package main
+package xchacha20poly1305
 
 import (
        "encoding/hex"
@@ -60,7 +60,7 @@ func TestXChaCha20(t *testing.T) {
 
                        // test encryption
 
-                       ct := XChaCha20Poly1305Encrypt(
+                       ct := Encrypt(
                                nil,
                                &nonceArray,
                                pt,
@@ -74,7 +74,7 @@ func TestXChaCha20(t *testing.T) {
 
                        // test decryption
 
-                       ptp, err := XChaCha20Poly1305Decrypt(
+                       ptp, err := Decrypt(
                                nil,
                                &nonceArray,
                                ct,

diff --git a/noise-protocol.go b/noise-protocol.go
index 31ae55b16a1e0a5391b0c25a1bd5273cb45e3f19..df08a0ab46213f1abf180c35d66affa1e1277a2f 100644 (file)
--- a/noise-protocol.go
+++ b/noise-protocol.go
@@ -2,6 +2,7 @@ package main
 
 import (
        "errors"
+       "git.zx2c4.com/wireguard-go/internal/tai64n"
        "golang.org/x/crypto/blake2s"
        "golang.org/x/crypto/chacha20poly1305"
        "golang.org/x/crypto/poly1305"
@@ -58,7 +59,7 @@ type MessageInitiation struct {
        Sender    uint32
        Ephemeral NoisePublicKey
        Static    [NoisePublicKeySize + poly1305.TagSize]byte
-       Timestamp [TimestampSize + poly1305.TagSize]byte
+       Timestamp [tai64n.TimestampSize + poly1305.TagSize]byte
        MAC1      [blake2s.Size128]byte
        MAC2      [blake2s.Size128]byte
 }
@@ -99,7 +100,7 @@ type Handshake struct {
        remoteStatic              NoisePublicKey           // long term key
        remoteEphemeral           NoisePublicKey           // ephemeral public key
        precomputedStaticStatic   [NoisePublicKeySize]byte // precomputed shared secret
-       lastTimestamp             Timestamp
+       lastTimestamp             tai64n.Timestamp
        lastInitiationConsumption time.Time
 }
 
@@ -206,7 +207,7 @@ func (device *Device) CreateMessageInitiation(peer *Peer) (*MessageInitiation, e
 
        // encrypt timestamp
 
-       timestamp := TimestampNow()
+       timestamp := tai64n.Now()
        func() {
                var key [chacha20poly1305.KeySize]byte
                KDF2(
@@ -271,7 +272,7 @@ func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation) *Peer {
 
        // verify identity
 
-       var timestamp Timestamp
+       var timestamp tai64n.Timestamp
        var key [chacha20poly1305.KeySize]byte
 
        handshake.mutex.RLock()