diff --git a/cross_language_tests/aes_cross_test.go b/cross_language_tests/aes_cross_test.go index 533ea77..4604dbb 100644 --- a/cross_language_tests/aes_cross_test.go +++ b/cross_language_tests/aes_cross_test.go @@ -59,7 +59,6 @@ func TestAesRuby(t *testing.T) { b, err := msgpack.Marshal(tt) require.NoError(t, err) - //#nosec G306 -- Need readable files require.NoError(t, os.WriteFile(testfile, []byte(base64.StdEncoding.EncodeToString(b)), 0644)) }) diff --git a/cross_language_tests/challenge_cross_test.go b/cross_language_tests/challenge_cross_test.go index 4acd3d4..abe2c7c 100644 --- a/cross_language_tests/challenge_cross_test.go +++ b/cross_language_tests/challenge_cross_test.go @@ -196,7 +196,7 @@ func TestChallenge_GoGenerate_RubyRespond(t *testing.T) { outerResponse, err := challenge.UnmarshalResponse(tamperWithResponse(t, challengeOuterBoxBytes, outerResponseBytes)) require.NoError(t, err) - _, err = outerResponse.Open(*challengePrivateEncryptionKey) + _, err = outerResponse.Open(challengePrivateEncryptionKey) require.Error(t, err) }) @@ -210,11 +210,11 @@ func TestChallenge_GoGenerate_RubyRespond(t *testing.T) { // try to open with a bad key _, malloryPrivKey, err := box.GenerateKey(rand.Reader) require.NoError(t, err) - _, err = outerResponse.Open(*malloryPrivKey) + _, err = outerResponse.Open(malloryPrivKey) require.Error(t, err) // open with legit key - innerResponse, err := outerResponse.Open(*challengePrivateEncryptionKey) + innerResponse, err := outerResponse.Open(challengePrivateEncryptionKey) require.NoError(t, err) // verify data diff --git a/cross_language_tests/rsa_cross_test.go b/cross_language_tests/rsa_cross_test.go index e2685ec..7bd8591 100644 --- a/cross_language_tests/rsa_cross_test.go +++ b/cross_language_tests/rsa_cross_test.go @@ -98,7 +98,6 @@ func TestRsaRuby(t *testing.T) { b, err := msgpack.Marshal(tt) require.NoError(t, err) - //#nosec G306 -- Need readable files require.NoError(t, os.WriteFile(testfile, []byte(base64.StdEncoding.EncodeToString(b)), 0644)) @@ -132,7 +131,6 @@ func TestRsaRuby(t *testing.T) { b, err := msgpack.Marshal(tt) require.NoError(t, err) - //#nosec G306 -- Need readable files require.NoError(t, os.WriteFile(testfile, []byte(base64.StdEncoding.EncodeToString(b)), 0644)) @@ -161,7 +159,6 @@ func TestRsaRuby(t *testing.T) { b, err := msgpack.Marshal(tt) require.NoError(t, err) - //#nosec G306 -- Need readable files require.NoError(t, os.WriteFile(testfile, []byte(base64.StdEncoding.EncodeToString(b)), 0644)) diff --git a/pkg/challenge/challenge_test.go b/pkg/challenge/challenge_test.go index bec92bd..f8c1163 100644 --- a/pkg/challenge/challenge_test.go +++ b/pkg/challenge/challenge_test.go @@ -107,11 +107,11 @@ func TestChallengeHappyPath(t *testing.T) { // try to open with a bad key _, malloryPrivKey, err := box.GenerateKey(rand.Reader) require.NoError(t, err) - _, err = outerResponse.Open(*malloryPrivKey) + _, err = outerResponse.Open(malloryPrivKey) require.Error(t, err) // open with legit key - innerResponse, err := outerResponse.Open(*challengePrivateEncryptionKey) + innerResponse, err := outerResponse.Open(challengePrivateEncryptionKey) require.NoError(t, err) // verify data diff --git a/pkg/challenge/response.go b/pkg/challenge/response.go index e8fbbf8..e8d3b78 100644 --- a/pkg/challenge/response.go +++ b/pkg/challenge/response.go @@ -21,8 +21,8 @@ type OuterResponse struct { ChallengeId []byte `msgpack:"challengeId"` } -func (o *OuterResponse) Open(privateEncryptionKey [32]byte) (*InnerResponse, error) { - innerResponseBytes, err := echelper.OpenNaCl(o.Msg, &o.PublicEncryptionKey, &privateEncryptionKey) +func (o *OuterResponse) Open(privateEncryptionKey *[32]byte) (*InnerResponse, error) { + innerResponseBytes, err := echelper.OpenNaCl(o.Msg, &o.PublicEncryptionKey, privateEncryptionKey) if err != nil { return nil, fmt.Errorf("opening challenge response box: %w", err) }