Add parsing for NSS-wrapped Ed25519 keys #15742
Merged
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
NSS wraps Ed25519 using the PKCS#8 standard structure. The Go standard library as of Go 1.18.x doesn't support parsing this key type with the OID used by NSS; it requires the 1.3.101.112/RFC 8410 format, rather than the RFC 5915-esque structure supported here. Co-authored-by: Rachel Culpepper <[email protected]> Signed-off-by: Alexander Scheel <[email protected]>
Co-authored-by: Rachel Culpepper <[email protected]> Signed-off-by: Alexander Scheel <[email protected]>
Co-authored-by: Rachel Culpepper <[email protected]> Signed-off-by: Alexander Scheel <[email protected]>
| @@ -1385,7 +1385,17 @@ func (p *Policy) Import(ctx context.Context, storage logical.Storage, key []byte | |||
| } else { | |||
| parsedPrivateKey, err := x509.ParsePKCS8PrivateKey(key) | |||
| if err != nil { | |||
| return fmt.Errorf("error parsing asymmetric key: %s", err) | |||
| if strings.Contains(err.Error(), "unknown elliptic curve") { | |||
There was a problem hiding this comment.
This seems a little brittle against possible future changes from an error message?
Are there any reasons we don't just try to call ParsePKCS8Ed25519PrivateKey on any err?
There was a problem hiding this comment.
We might have a bad ASN.1 blob or something else, that'd trigger a non-unknown curve error. If that's the case, the Ed25519 parsing won't do anything, but give a weird, unrelated error message (if you say, had a corrupted RSA key, the Ed25519 would be weird).
There was a problem hiding this comment.
Alright I suppose the unit test will catch the change if they ever do update the error message.
stevendpclark
approved these changes
Jun 2, 2022
|
Thanks all! Merging... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
NSS wraps Ed25519 using the PKCS#8 standard structure. The Go standard
library as of Go 1.18.x doesn't support parsing this key type with the
OID used by NSS; it requires the 1.3.101.112/RFC 8410 format, rather
than the RFC 5915-esque structure supported here.