From 94a7385904d11e9ff73450c6f8723969e916a1e6 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-vault-core <82990506+hc-github-team-secure-vault-core@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:34:52 -0400 Subject: [PATCH] backport of commit 360a406a2f924f0a46491a77bdd9e1fcf03b99fa (#20928) Co-authored-by: Steven Clark --- command/transit.go | 2 +- command/transit_import_key.go | 6 +++--- command/transit_import_key_version.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/command/transit.go b/command/transit.go index 602bc198c..a48fef785 100644 --- a/command/transit.go +++ b/command/transit.go @@ -27,7 +27,7 @@ Usage: vault transit [options] [args] Engine. Here are some simple examples, and more detailed examples are available in the subcommands or the documentation. - To import a key into the specified Transit or Transform mount: + To import a key into the specified Transit mount: $ vault transit import transit/keys/newly-imported @path/to/key type=rsa-2048 diff --git a/command/transit_import_key.go b/command/transit_import_key.go index 35801f43a..3eea70093 100644 --- a/command/transit_import_key.go +++ b/command/transit_import_key.go @@ -35,18 +35,18 @@ type TransitImportCommand struct { } func (c *TransitImportCommand) Synopsis() string { - return "Import a key into the Transit or Transform secrets engines." + return "Import a key into the Transit secrets engines." } func (c *TransitImportCommand) Help() string { helpText := ` Usage: vault transit import PATH KEY [options...] - Using the Transit or Transform key wrapping system, imports key material from + Using the Transit key wrapping system, imports key material from the base64 encoded KEY (either directly on the CLI or via @path notation), into a new key whose API path is PATH. To import a new version into an existing key, use import_version. The remaining options after KEY (key=value - style) are passed on to the Transit or Transform create key endpoint. If your + style) are passed on to the Transit create key endpoint. If your system or device natively supports the RSA AES key wrap mechanism (such as the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it directly rather than this command. diff --git a/command/transit_import_key_version.go b/command/transit_import_key_version.go index 4cf9602d4..1a2507892 100644 --- a/command/transit_import_key_version.go +++ b/command/transit_import_key_version.go @@ -20,18 +20,18 @@ type TransitImportVersionCommand struct { } func (c *TransitImportVersionCommand) Synopsis() string { - return "Import key material into a new key version in the Transit or Transform secrets engines." + return "Import key material into a new key version in the Transit secrets engines." } func (c *TransitImportVersionCommand) Help() string { helpText := ` Usage: vault transit import-version PATH KEY [...] - Using the Transit or Transform key wrapping system, imports key material from + Using the Transit key wrapping system, imports key material from the base64 encoded KEY (either directly on the CLI or via @path notation), - into a new key whose API path is PATH. To import a new Transit or Transform + into a new key whose API path is PATH. To import a new Transit key, use the import command instead. The remaining options after KEY - (key=value style) are passed on to the Transit or Transform create key endpoint. + (key=value style) are passed on to the Transit create key endpoint. If your system or device natively supports the RSA AES key wrap mechanism (such as the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it directly rather than this command.