Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

response returns errors when signer2 provided but signing fails #40

Closed
wants to merge 1 commit into from
Closed

response returns errors when signer2 provided but signing fails #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/challenge/challenge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ func (o *OuterChallenge) Respond(signer crypto.Signer, signer2 crypto.Signer, re

var signature2 []byte
if signer2 != nil {
//nolint: errcheck - we allow nil signer2
signature2, _ = echelper.SignWithTimeout(signer2, innerResponse, signingTimeoutDuration, signingTimeoutInterval)
signature2, err = echelper.SignWithTimeout(signer2, innerResponse, signingTimeoutDuration, signingTimeoutInterval)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want this? Given the flakiness of the TPMs, I thought the old behavior was correct, but maybe needs a better comment.

if err != nil {
return nil, fmt.Errorf("signing challenge 2: %w", err)
}
}

sealed, pub, err := echelper.SealNaCl(innerResponse, &o.innerChallenge.PublicEncryptionKey)
Expand Down
3 changes: 0 additions & 3 deletions pkg/challenge/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ func (o *OuterResponse) Open(privateEncryptionKey *[32]byte) (*InnerResponse, er

// no sig 2 provided, return what we have
if o.Sig2 == nil || len(o.Sig2) <= 0 {
// if there is no sig2, set public signing key 2 to nil just in case so that
// the consumer does not falsely assume it was used to perform a signature
innerResponse.PublicSigningKey2 = nil
return &innerResponse, nil
}

Expand Down
Loading