From b8cb6cf01616a6eaa66a88e35047b44146196b50 Mon Sep 17 00:00:00 2001
From: Adrian Utrilla <adrianutrilla@gmail.com>
Date: Wed, 24 Aug 2016 16:48:56 -0700
Subject: [PATCH] Fixed failing tests

---
 Dockerfile            |  1 +
 aes/decryptor_test.go | 20 ++++++++++----------
 sops_test.go          |  6 ++++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 75e42d9dc..7061147f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,4 +3,5 @@ FROM golang:1.7
 COPY . /go/src/go.mozilla.org/sops
 WORKDIR /go/src/go.mozilla.org/sops
 RUN go get -d -v
+RUN go test ./...
 RUN go install -v ./...
diff --git a/aes/decryptor_test.go b/aes/decryptor_test.go
index b1b55bff5..e6e715565 100644
--- a/aes/decryptor_test.go
+++ b/aes/decryptor_test.go
@@ -12,7 +12,7 @@ func TestDecrypt(t *testing.T) {
 	expected := "foo"
 	key := []byte(strings.Repeat("f", 32))
 	message := `ENC[AES256_GCM,data:oYyi,iv:MyIDYbT718JRr11QtBkcj3Dwm4k1aCGZBVeZf0EyV8o=,tag:t5z2Z023Up0kxwCgw1gNxg==,type:str]`
-	decryption, err := Decrypt(message, key, []byte("bar:"))
+	decryption, err := Cipher{}.Decrypt(message, key, []byte("bar:"))
 	if err != nil {
 		t.Errorf("%s", err)
 	}
@@ -23,7 +23,7 @@ func TestDecrypt(t *testing.T) {
 
 func TestDecryptInvalidAad(t *testing.T) {
 	message := `ENC[AES256_GCM,data:oYyi,iv:MyIDYbT718JRr11QtBkcj3Dwm4k1aCGZBVeZf0EyV8o=,tag:t5z2Z023Up0kxwCgw1gNxg==,type:str]`
-	_, err := Decrypt(message, []byte(strings.Repeat("f", 32)), []byte(""))
+	_, err := Cipher{}.Decrypt(message, []byte(strings.Repeat("f", 32)), []byte(""))
 	if err == nil {
 		t.Errorf("Decrypting with an invalid AAC should fail")
 	}
@@ -36,12 +36,12 @@ func TestRoundtripString(t *testing.T) {
 		if x == "" {
 			return true
 		}
-		s, err := Encrypt(x, key, aad)
+		s, err := Cipher{}.Encrypt(x, key, aad)
 		if err != nil {
 			fmt.Println(err)
 			return false
 		}
-		d, err := Decrypt(s, key, aad)
+		d, err := Cipher{}.Decrypt(s, key, aad)
 		if err != nil {
 			return false
 		}
@@ -55,12 +55,12 @@ func TestRoundtripString(t *testing.T) {
 func TestRoundtripFloat(t *testing.T) {
 	key := []byte(strings.Repeat("f", 32))
 	f := func(x float64) bool {
-		s, err := Encrypt(x, key, []byte(""))
+		s, err := Cipher{}.Encrypt(x, key, []byte(""))
 		if err != nil {
 			fmt.Println(err)
 			return false
 		}
-		d, err := Decrypt(s, key, []byte(""))
+		d, err := Cipher{}.Decrypt(s, key, []byte(""))
 		if err != nil {
 			return false
 		}
@@ -74,12 +74,12 @@ func TestRoundtripFloat(t *testing.T) {
 func TestRoundtripInt(t *testing.T) {
 	key := []byte(strings.Repeat("f", 32))
 	f := func(x int) bool {
-		s, err := Encrypt(x, key, []byte(""))
+		s, err := Cipher{}.Encrypt(x, key, []byte(""))
 		if err != nil {
 			fmt.Println(err)
 			return false
 		}
-		d, err := Decrypt(s, key, []byte(""))
+		d, err := Cipher{}.Decrypt(s, key, []byte(""))
 		if err != nil {
 			return false
 		}
@@ -93,12 +93,12 @@ func TestRoundtripInt(t *testing.T) {
 func TestRoundtripBool(t *testing.T) {
 	key := []byte(strings.Repeat("f", 32))
 	f := func(x bool) bool {
-		s, err := Encrypt(x, key, []byte(""))
+		s, err := Cipher{}.Encrypt(x, key, []byte(""))
 		if err != nil {
 			fmt.Println(err)
 			return false
 		}
-		d, err := Decrypt(s, key, []byte(""))
+		d, err := Cipher{}.Decrypt(s, key, []byte(""))
 		if err != nil {
 			return false
 		}
diff --git a/sops_test.go b/sops_test.go
index 2cb98a323..aa65a59c5 100644
--- a/sops_test.go
+++ b/sops_test.go
@@ -2,6 +2,7 @@ package sops
 
 import (
 	"bytes"
+	"go.mozilla.org/sops/aes"
 	"reflect"
 	"testing"
 )
@@ -20,14 +21,15 @@ func TestUnencryptedSuffix(t *testing.T) {
 			Value: "bar",
 		},
 	}
-	_, err := tree.Encrypt(bytes.Repeat([]byte("f"), 32))
+	cipher := aes.Cipher{}
+	_, err := tree.Encrypt(bytes.Repeat([]byte("f"), 32), cipher)
 	if err != nil {
 		t.Errorf("Encrypting the tree failed: %s", err)
 	}
 	if !reflect.DeepEqual(tree.Branch, expected) {
 		t.Errorf("Trees don't match: \ngot \t\t%+v,\n expected \t\t%+v", tree.Branch, expected)
 	}
-	_, err = tree.Decrypt(bytes.Repeat([]byte("f"), 32))
+	_, err = tree.Decrypt(bytes.Repeat([]byte("f"), 32), cipher)
 	if err != nil {
 		t.Errorf("Decrypting the tree failed: %s", err)
 	}