This repository has been archived by the owner on Feb 9, 2024. It is now read-only.
Expose Hash, Sign, VerifySignature and VerifyHashSignature #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch refactors some of the internal logic to expose public functions that can be used outside of a MAR file.
Pull Request Test Coverage Report for Build 61
💛 - Coveralls |
g-k
previously approved these changes
Jun 21, 2018
sign.go
Outdated
| @@ -64,44 +66,16 @@ func (file *File) FinalizeSignatures() error { | |||
| if err != nil { | |||
| return err | |||
| } | |||
| if len(file.Signatures) == 0 { | |||
| return fmt.Errorf("there are no signature to finalize") | |||
sign.go
Outdated
| sigData, err := file.Signatures[i].privateKey.(crypto.Signer).Sign( | ||
| rand.Reader, md.Sum(nil), h) | ||
| hashed, hashAlg, err := Hash(signableBlock, file.Signatures[i].AlgorithmID) | ||
| sigData, err := Sign(file.Signatures[i].privateKey, rand.Reader, hashed, hashAlg) |
| @@ -112,6 +86,46 @@ func (file *File) MarshalForSignature() ([]byte, error) { | |||
| return file.Marshal() | |||
| } | |||
|
|
|||
| // Hash takes an input and a signature algorithm and returns its hashed value | |||
| func Hash(input []byte, sigalg uint32) (output []byte, h crypto.Hash, err error) { | |||
There was a problem hiding this comment.
might want a type alias for the sig algs
There was a problem hiding this comment.
does that buy us anything? we'll need to type assert to uint32 for marshalling
sign.go
Outdated
| // Sign signs digest with the private key, possibly using entropy from rand | ||
| func Sign(key crypto.PrivateKey, rand io.Reader, digest []byte, h crypto.Hash) (sigData []byte, err error) { | ||
| // call the signer interface of the private key to sign the hash | ||
| sigData, err = key.(crypto.Signer).Sign(rand, digest, h) |
There was a problem hiding this comment.
can the cast to crypto.Signer fail and if so do we need to handle that?
There was a problem hiding this comment.
I added an assertion that will return an error if Signer isn't implemented
verify.go
Outdated
| } | ||
|
|
||
| // VerifyHashSignature takes a signature, the digest of a signed MAR block, a hash algorithm and a public | ||
| // key and return nil if a valid signature is found, or an error if it isn't |
verify.go
Outdated
|
|
||
| // VerifyHashSignature takes a signature, the digest of a signed MAR block, a hash algorithm and a public | ||
| // key and return nil if a valid signature is found, or an error if it isn't | ||
| func VerifyHashSignature(signature []byte, digest []byte, hashAlg crypto.Hash, key crypto.PublicKey) error { |
There was a problem hiding this comment.
👍 for splitting this out of VerifySignature
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch refactors some of the internal logic to expose public functions that can be used outside of a MAR file.