Merge pull request #1208 from smallstep/mariano/fix-1207

maraino · web-flow · commit e6c5f218f0b1 · 2024-06-18T16:28:33.000-07:00
Set proper JOSE algorithm for Ed25519 keys
diff --git a/internal/cryptoutil/cryptoutil.go b/internal/cryptoutil/cryptoutil.go
@@ -135,7 +135,7 @@ func LoadJSONWebKey(kms, name string, opts ...jose.Option) (*jose.JSONWebKey, er
 	case *rsa.PublicKey:
 		jwk.Algorithm = jose.RS256
 	case ed25519.PublicKey:
-		jwk.Algorithm = jose.XEdDSA
+		jwk.Algorithm = jose.EdDSA
 	default:
 		return nil, fmt.Errorf("unsupported key type %T", pub)
 	}

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func LoadJSONWebKey(kms, name string, opts ...jose.Option) (*jose.JSONWebKey, er`
`135`	`135`	`case *rsa.PublicKey:`
`136`	`136`	`jwk.Algorithm = jose.RS256`
`137`	`137`	`case ed25519.PublicKey:`
`138`		`- jwk.Algorithm = jose.XEdDSA`
	`138`	`+ jwk.Algorithm = jose.EdDSA`
`139`	`139`	`default:`
`140`	`140`	`return nil, fmt.Errorf("unsupported key type %T", pub)`
`141`	`141`	`}`