From f6b1c680b3f7c7d5cd842cca3117f5ee2f0f2fad Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 18 Apr 2020 16:14:48 +0200
Subject: nametransform: update comment & simplify tests

The comment still mentioned CBC, which has been removed
a long time ago.

The test definition can be rewritten using slice literals,
saving sume stuttering.
---
 internal/nametransform/names.go      |  4 ++--
 internal/nametransform/names_test.go | 24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'internal/nametransform')

diff --git a/internal/nametransform/names.go b/internal/nametransform/names.go
index de70bce..e9f9346 100644
--- a/internal/nametransform/names.go
+++ b/internal/nametransform/names.go
@@ -105,8 +105,8 @@ func (n *NameTransform) decryptName(cipherName string, iv []byte) (string, error
 	return plain, err
 }
 
-// EncryptName encrypts "plainName", returns a base64-encoded "cipherName64".
-// The encryption is either CBC or EME, depending on "useEME".
+// EncryptName encrypts "plainName", returns a base64-encoded "cipherName64",
+// encrypted using EME (https://github.com/rfjakob/eme).
 //
 // This function is exported because in some cases, fusefrontend needs access
 // to the full (not hashed) name if longname is used.
diff --git a/internal/nametransform/names_test.go b/internal/nametransform/names_test.go
index 0254777..9d77c2d 100644
--- a/internal/nametransform/names_test.go
+++ b/internal/nametransform/names_test.go
@@ -6,10 +6,11 @@ import (
 )
 
 func TestPad16(t *testing.T) {
-	var s [][]byte
-	s = append(s, []byte("foo"))
-	s = append(s, []byte("12345678901234567"))
-	s = append(s, []byte("12345678901234567abcdefg"))
+	s := [][]byte{
+		[]byte("foo"),
+		[]byte("12345678901234567"),
+		[]byte("12345678901234567abcdefg"),
+	}
 
 	for i := range s {
 		orig := s[i]
@@ -35,13 +36,14 @@ func TestPad16(t *testing.T) {
 
 // TestUnpad16Garbage - unPad16 should never crash on corrupt or malicious inputs
 func TestUnpad16Garbage(t *testing.T) {
-	var testCases [][]byte
-	testCases = append(testCases, make([]byte, 0))
-	testCases = append(testCases, make([]byte, 16))
-	testCases = append(testCases, make([]byte, 1))
-	testCases = append(testCases, make([]byte, 17))
-	testCases = append(testCases, bytes.Repeat([]byte{16}, 16))
-	testCases = append(testCases, bytes.Repeat([]byte{17}, 16))
+	testCases := [][]byte{
+		make([]byte, 0),
+		make([]byte, 16),
+		make([]byte, 1),
+		make([]byte, 17),
+		bytes.Repeat([]byte{16}, 16),
+		bytes.Repeat([]byte{17}, 16),
+	}
 	for _, v := range testCases {
 		_, err := unPad16([]byte(v))
 		if err == nil {
-- 
cgit v1.2.3