From 6cd180746f8e0baf6fe52a1ca9c35e4db0886af1 Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@tailscale.com>
Date: Thu, 2 Dec 2021 18:04:48 -0800
Subject: [PATCH] control/controlbase: rename from control/noise.
Updates #3488
Signed-off-by: David Anderson <danderson@tailscale.com>
---
control/{noise => controlbase}/conn.go | 2 +-
control/{noise => controlbase}/conn_test.go | 2 +-
control/{noise => controlbase}/handshake.go | 2 +-
control/{noise => controlbase}/handshake_test.go | 2 +-
control/{noise => controlbase}/interop_test.go | 2 +-
control/{noise => controlbase}/messages.go | 2 +-
control/{noise => controlbase}/noiseexplorer_test.go | 2 +-
scripts/check_license_headers.sh | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
rename control/{noise => controlbase}/conn.go (99%)
rename control/{noise => controlbase}/conn_test.go (99%)
rename control/{noise => controlbase}/handshake.go (99%)
rename control/{noise => controlbase}/handshake_test.go (99%)
rename control/{noise => controlbase}/interop_test.go (99%)
rename control/{noise => controlbase}/messages.go (99%)
rename control/{noise => controlbase}/noiseexplorer_test.go (99%)
diff --git a/control/noise/conn.go b/control/controlbase/conn.go
similarity index 99%
rename from control/noise/conn.go
rename to control/controlbase/conn.go
index 928de5ff3..0e28f4d08 100644
--- a/control/noise/conn.go
+++ b/control/controlbase/conn.go
@@ -7,7 +7,7 @@
//
// The base transport implements Noise IK, instantiated with
// Curve25519, ChaCha20Poly1305 and BLAKE2s.
-package noise
+package controlbase
import (
"crypto/cipher"
diff --git a/control/noise/conn_test.go b/control/controlbase/conn_test.go
similarity index 99%
rename from control/noise/conn_test.go
rename to control/controlbase/conn_test.go
index e87e4e159..a8328bd0b 100644
--- a/control/noise/conn_test.go
+++ b/control/controlbase/conn_test.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package noise
+package controlbase
import (
"bufio"
diff --git a/control/noise/handshake.go b/control/controlbase/handshake.go
similarity index 99%
rename from control/noise/handshake.go
rename to control/controlbase/handshake.go
index 79419f62b..57606581c 100644
--- a/control/noise/handshake.go
+++ b/control/controlbase/handshake.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package noise
+package controlbase
import (
"context"
diff --git a/control/noise/handshake_test.go b/control/controlbase/handshake_test.go
similarity index 99%
rename from control/noise/handshake_test.go
rename to control/controlbase/handshake_test.go
index 6ef228552..a5664c11a 100644
--- a/control/noise/handshake_test.go
+++ b/control/controlbase/handshake_test.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package noise
+package controlbase
import (
"bytes"
diff --git a/control/noise/interop_test.go b/control/controlbase/interop_test.go
similarity index 99%
rename from control/noise/interop_test.go
rename to control/controlbase/interop_test.go
index cb2b8ae3b..04bd7f41d 100644
--- a/control/noise/interop_test.go
+++ b/control/controlbase/interop_test.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package noise
+package controlbase
import (
"context"
diff --git a/control/noise/messages.go b/control/controlbase/messages.go
similarity index 99%
rename from control/noise/messages.go
rename to control/controlbase/messages.go
index 658cec314..2a64d4585 100644
--- a/control/noise/messages.go
+++ b/control/controlbase/messages.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package noise
+package controlbase
import "encoding/binary"
diff --git a/control/noise/noiseexplorer_test.go b/control/controlbase/noiseexplorer_test.go
similarity index 99%
rename from control/noise/noiseexplorer_test.go
rename to control/controlbase/noiseexplorer_test.go
index cd70be713..7407ae533 100644
--- a/control/noise/noiseexplorer_test.go
+++ b/control/controlbase/noiseexplorer_test.go
@@ -24,7 +24,7 @@ IK:
* PARAMETERS *
* ---------------------------------------------------------------- */
-package noise
+package controlbase
import (
"crypto/rand"
diff --git a/scripts/check_license_headers.sh b/scripts/check_license_headers.sh
index e3558efa7..3d6eb20e1 100755
--- a/scripts/check_license_headers.sh
+++ b/scripts/check_license_headers.sh
@@ -41,7 +41,7 @@ for file in $(find $1 -name '*.go' -not -path '*/.git/*'); do
*_string.go)
# Generated file from go:generate stringer
;;
- $1/control/noise/noiseexplorer_test.go)
+ $1/control/controlbase/noiseexplorer_test.go)
# Noiseexplorer.com copyright.
;;
*)