ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20654 from hashicorp/b-filebase64sha256-sha512 

lang/funcs: Fix filebase64sha256 function hashing algorithm
This commit is contained in:
Brian Flad 2019-03-12 13:37:14 -04:00 committed by GitHub
parent 4de0b33097 81bdaa8c38
commit 7a135c98d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/funcs/crypto.go
View File

@ -39,7 +39,7 @@ var Base64Sha256Func = makeStringHashFunction(sha256.New, base64.StdEncoding.Enc
// MakeFileBase64Sha256Func constructs a function that is like Base64Sha256Func but reads the // MakeFileBase64Sha256Func constructs a function that is like Base64Sha256Func but reads the
// contents of a file rather than hashing a given literal string. // contents of a file rather than hashing a given literal string.
func MakeFileBase64Sha256Func(baseDir string) function.Function { func MakeFileBase64Sha256Func(baseDir string) function.Function {
return makeFileHashFunction(baseDir, sha512.New, base64.StdEncoding.EncodeToString) return makeFileHashFunction(baseDir, sha256.New, base64.StdEncoding.EncodeToString)
} }
// Base64Sha512Func constructs a function that computes the SHA256 hash of a given string // Base64Sha512Func constructs a function that computes the SHA256 hash of a given string

6
lang/funcs/crypto_test.go
View File

@ -64,12 +64,12 @@ func TestFileBase64Sha256(t *testing.T) {
}{ }{
{ {
cty.StringVal("testdata/hello.txt"), cty.StringVal("testdata/hello.txt"),
cty.StringVal("LHT9F+2v2A6ER7DUZ0HuJDt+t03SFJoKsbkkb7MDgvJ+hT2FhXGeDmfL2g2qj1FnEGRhXWRa4nrLFb+xRH9Fmw=="), cty.StringVal("pZGm1Av0IEBKARczz7exkNYsZb8LzaMrV7J32a2fFG4="),
false, false,
}, },
{ {
cty.StringVal("testdata/icon.png"), cty.StringVal("testdata/icon.png"),
cty.StringVal("wSInO/tKEOaLGCAY2h/7gtLWMpzyLJ0ijFh95JTpYrPzXQYgviAdL9ZgpD9EAte8On+drvhFvjIFsfQUwxbNPQ=="), cty.StringVal("47U1q9IZW093SmAzdC820Skpn8vHPvc8szud/Y3ezpo="),
false, false,
}, },
{ {
@ -79,7 +79,7 @@ func TestFileBase64Sha256(t *testing.T) {
}, },
} }
fileSHA256 := MakeFileBase64Sha512Func(".") fileSHA256 := MakeFileBase64Sha256Func(".")
for _, test := range tests { for _, test := range tests {
t.Run(fmt.Sprintf("filebase64sha256(%#v)", test.Path), func(t *testing.T) { t.Run(fmt.Sprintf("filebase64sha256(%#v)", test.Path), func(t *testing.T) {