Skip to content

Add initial support for ML-DSA #364

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

Draft
maraino wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add initial support for ML-DSA #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
608ece4
Add initial support for ML-DSA
maraino Aug 5, 2026
ebea0d2
Use kty AKP for ML-DSA keys and alg for defining the actual algorithm
maraino Aug 5, 2026
afa0cc2
Update crypto
maraino Aug 5, 2026
997d84c
Use ML-DSA-44 as default for AKP types
maraino Aug 11, 2026
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
24 changes: 20 additions & 4 deletions cmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,17 @@ var okpSignatureAlgorithmMapping = map[okpParams]apiv1.SignatureAlgorithm{
{"ED25519"}: apiv1.PureEd25519,
}

type akpParams struct {
alg string
}

var akpSignatureAlgorithmMapping = map[akpParams]apiv1.SignatureAlgorithm{
{""}: apiv1.MLDSA44,
{"ML-DSA-44"}: apiv1.MLDSA44,
{"ML-DSA-65"}: apiv1.MLDSA65,
{"ML-DSA-87"}: apiv1.MLDSA87,
}

var pinPolicyMapping = map[string]apiv1.PINPolicy{
"": 0, // Use default on YubiKey kms (always)
"NEVER": apiv1.PINPolicyNever,
Expand All @@ -306,6 +317,8 @@ func getSignatureAlgorithm(kty, crv, alg string, pss bool) apiv1.SignatureAlgori
return rsaSignatureAlgorithmMapping[rsaParams{alg, pss}]
case "OKP":
return okpSignatureAlgorithmMapping[okpParams{crv}]
case "AKP":
return akpSignatureAlgorithmMapping[akpParams{crv}]
default:
return ecSignatureAlgorithmMapping[ecParams{crv}]
}
Expand All @@ -329,18 +342,21 @@ func init() {
flags := createCmd.Flags()
flags.SortFlags = false

kty := flagutil.UpperValue("kty", []string{"EC", "RSA", "OKP"}, "EC")
kty := flagutil.UpperValue("kty", []string{"EC", "RSA", "OKP", "AKP"}, "EC")
crv := flagutil.NormalizedValue("crv", []string{"P256", "P384", "P521", "Ed25519"}, "P256")
alg := flagutil.NormalizedValue("alg", []string{"SHA256", "SHA384", "SHA512"}, "SHA256")
alg := flagutil.NormalizedValue("alg", []string{"SHA256", "SHA384", "SHA512", "ML-DSA-44", "ML-DSA-65", "ML-DSA-87"}, "SHA256")
format := flagutil.NormalizedValue("format", []string{"PKIX", "PKCS1", "TSS2"}, "PKIX")
protectionLevel := flagutil.UpperValue("protection-level", []string{"SOFTWARE", "HSM"}, "SOFTWARE")
pinPolicy := flagutil.UpperValue("pin-policy", []string{"NEVER", "ALWAYS", "ONCE"}, "")
touchPolicy := flagutil.UpperValue("touch-policy", []string{"NEVER", "ALWAYS", "CACHED"}, "")

flags.Var(kty, "kty", "The key `type` to build the certificate upon.\nOptions are EC, RSA or OKP")
flags.Var(kty, "kty", "The key `type` to build the certificate upon.\nOptions are EC, RSA, OKP or AKP")
flags.Var(crv, "crv", "The elliptic `curve` to use for EC and OKP key types.\nOptions are P256, P384, P521 or Ed25519 on OKP")
flags.Int("size", 3072, "The key size for an RSA key")
flags.Var(alg, "alg", "The hashing `algorithm` to use on RSA PKCS #1 and RSA-PSS signatures.\nOptions are SHA256, SHA384 or SHA512")
flags.Var(alg, "alg", "The hashing `algorithm` to use on RSA PKCS #1 and RSA-PSS signatures\n"+
`or the algorithm used on ML-DSA keys. Options are:
* SHA256, SHA384 or SHA512 for RSA keys.
* ML-DSA-44, ML-DSA-65 or ML-DSA-87 for ML-DSA keys.`)
flags.Var(protectionLevel, "protection-level", "The protection `level` used on some Cloud KMSs.\nOptions are SOFTWARE or HSM")
flags.Var(pinPolicy, "pin-policy", "The pin `policy` used on YubiKey KMS.\nOptions are NEVER, ALWAYS or ONCE")
flags.Var(touchPolicy, "touch-policy", "The touch `policy` used on YubiKey KMS.\nOptions are NEVER, ALWAYS or CACHED")
Expand Down
28 changes: 28 additions & 0 deletions cmd/crypto_go127.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//go:build go1.27

package cmd

import (
"crypto"
"crypto/mldsa"
"fmt"
)

func getSignerOptionsDefault(pub crypto.PublicKey) (crypto.SignerOpts, error) {
switch pub.(type) {
case *mldsa.PublicKey:
return crypto.Hash(0), nil
default:
return nil, fmt.Errorf("unsupported public key type %T", pub)
}
}

func verifySignatureDefault(signer crypto.Signer, data, sig []byte, so crypto.SignerOpts) bool {
opts, _ := so.(*mldsa.Options)
switch pub := signer.Public().(type) {
case *mldsa.PublicKey:
return mldsa.Verify(pub, data, sig, opts) == nil
default:
return false
}
}
16 changes: 16 additions & 0 deletions cmd/crypto_other.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//go:build !go1.27

package cmd

import (
"crypto"
"fmt"
)

func getSignerOptionsDefault(pub crypto.PublicKey) (crypto.SignerOpts, error) {
return nil, fmt.Errorf("unsupported public key type %T", pub)
}

func verifySignatureDefault(signer crypto.Signer, data, sig []byte, so crypto.SignerOpts) bool {
return false
}
4 changes: 2 additions & 2 deletions cmd/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func getSignerOptions(km kms.KeyManager, pub crypto.PublicKey, alg string, pss b
}
return getSignerOptions(km, pk, alg, pss, saltLength)
default:
return nil, fmt.Errorf("unsupported public key type %T", pub)
return getSignerOptionsDefault(pub)
}
}

Expand Down Expand Up @@ -330,7 +330,7 @@ func verifySignature(signer crypto.Signer, data, sig []byte, so crypto.SignerOpt
Blob: sig,
}) == nil
default:
return false
return verifySignatureDefault(signer, data, sig, so)
}
}

Expand Down
52 changes: 26 additions & 26 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/smallstep/cli-utils v0.12.2
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
go.step.sm/crypto v0.85.0
go.step.sm/crypto v0.87.1-0.20260805182418-a31136cd3809
golang.org/x/crypto v0.54.0
golang.org/x/term v0.45.0
)
Expand All @@ -17,9 +17,9 @@ require (
cloud.google.com/go/auth v0.20.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/iam v1.7.0 // indirect
cloud.google.com/go/kms v1.31.0 // indirect
cloud.google.com/go/longrunning v0.9.0 // indirect
cloud.google.com/go/iam v1.11.0 // indirect
cloud.google.com/go/kms v1.33.0 // indirect
cloud.google.com/go/longrunning v1.2.0 // indirect
dario.cat/mergo v1.0.2 // indirect
filippo.io/edwards25519 v1.2.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.22.0 // indirect
Expand All @@ -32,20 +32,20 @@ require (
github.com/Masterminds/semver/v3 v3.3.1 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/ThalesGroup/crypto11 v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2 v1.42.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.30 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.19.29 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.31 // indirect
github.com/aws/aws-sdk-go-v2 v1.43.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.31 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.19.30 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.31 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.31 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.31 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.32 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.30 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.54.1 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.4.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.32.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.37.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.44.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.31 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.55.0 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.5.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.33.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.45.0 // indirect
github.com/aws/smithy-go v1.27.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chzyer/readline v1.5.1 // indirect
Expand All @@ -63,8 +63,8 @@ require (
github.com/google/go-tspi v0.3.0 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.17 // indirect
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.18 // indirect
github.com/googleapis/gax-go/v2 v2.23.0 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
Expand All @@ -86,19 +86,19 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
golang.org/x/net v0.56.0 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/metric v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
golang.org/x/net v0.57.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.22.0 // indirect
golang.org/x/sys v0.47.0 // indirect
golang.org/x/text v0.40.0 // indirect
golang.org/x/time v0.15.0 // indirect
google.golang.org/api v0.288.0 // indirect
google.golang.org/api v0.290.0 // indirect
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260630182238-925bb5da69e7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260630182238-925bb5da69e7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260706201446-f0a921348800 // indirect
google.golang.org/grpc v1.82.1 // indirect
google.golang.org/protobuf v1.36.11 // indirect
)
Loading