From 967b027ca8b0e7ff210f10106c6720dbd2177fbc Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 26 Sep 2022 14:32:50 +0200 Subject: [PATCH] fix pivtool generate key touch policy Signed-off-by: cpanato --- cmd/cosign/cli/pivcli/commands.go | 4 ++-- cmd/cosign/cli/pkcs11cli/commands.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/cosign/cli/pivcli/commands.go b/cmd/cosign/cli/pivcli/commands.go index 8b2c2a13a87..169c2dbc97d 100644 --- a/cmd/cosign/cli/pivcli/commands.go +++ b/cmd/cosign/cli/pivcli/commands.go @@ -206,12 +206,12 @@ func GenerateKeyCmd(ctx context.Context, managementKey string, randomKey bool, s return flag.ErrHelp } - pinPolicy := pivkey.PINPolicyForName(pinPolicyArg, *slot) + pinPolicy := pivkey.PINPolicyForName(strings.ToLower(pinPolicyArg), *slot) if pinPolicy < 0 { return flag.ErrHelp } - touchPolicy := pivkey.TouchPolicyForName(pinPolicyArg, *slot) + touchPolicy := pivkey.TouchPolicyForName(strings.ToLower(touchPolicyArg), *slot) if touchPolicy < 0 { return flag.ErrHelp } diff --git a/cmd/cosign/cli/pkcs11cli/commands.go b/cmd/cosign/cli/pkcs11cli/commands.go index 76193afd23c..60f859fda8e 100644 --- a/cmd/cosign/cli/pkcs11cli/commands.go +++ b/cmd/cosign/cli/pkcs11cli/commands.go @@ -204,7 +204,6 @@ func GetKeysInfo(_ context.Context, modulePath string, slotID uint, pin string) } func ListTokensCmd(ctx context.Context, modulePath string) error { - tokens, err := GetTokens(ctx, modulePath) if err != nil { return err @@ -223,7 +222,6 @@ func ListTokensCmd(ctx context.Context, modulePath string) error { } func ListKeysUrisCmd(ctx context.Context, modulePath string, slotID uint, pin string) error { - keysInfo, err := GetKeysInfo(ctx, modulePath, slotID, pin) if err != nil { return err