tool: Rename command line arguments.

  - See #359.

3 files changed, 7 insertions, 6 deletions

diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs
index 259f08ab..a18ae25a 100644
--- a/tool/src/commands/key.rs
+++ b/tool/src/commands/key.rs
@@ -145,13 +145,13 @@ pub fn generate(m: &ArgMatches, force: bool) -> failure::Fallible<()> {
 
     // Encryption Capability
     match (m.value_of("can-encrypt"), m.is_present("cannot-encrypt")) {
-        (Some("all"), false) | (None, false) => {
+        (Some("universal"), false) | (None, false) => {
             builder = builder.add_subkey(KeyFlags::default()
                                          .set_transport_encryption(true)
                                          .set_storage_encryption(true),
                                          None);
         }
-        (Some("rest"), false) => {
+        (Some("storage"), false) => {
             builder = builder.add_storage_encryption_subkey();
         }
         (Some("transport"), false) => {
diff --git a/tool/src/sq-usage.rs b/tool/src/sq-usage.rs
index 397df53b..19607bb1 100644
--- a/tool/src/sq-usage.rs
+++ b/tool/src/sq-usage.rs
@@ -486,8 +486,8 @@
 //!         --with-password     Prompt for a password to protect the generated key with.
 //!
 //! OPTIONS:
-//!         --can-encrypt <PURPOSE>          The key has an encryption-capable subkey (default) [possible values: transport,
-//!                                          rest, all]
+//!         --can-encrypt <PURPOSE>          The key has an encryption-capable subkey (default: universal) [possible values:
+//!                                          transport, storage, universal]
 //!     -c, --cipher-suite <CIPHER-SUITE>    Cryptographic algorithms used for the key. [default: cv25519]  [possible
 //!                                          values: rsa3k, rsa4k, cv25519]
 //!         --expiry <EXPIRY>                When the key should expire.  Either 'N[ymwd]', for N years, months, weeks, or
diff --git a/tool/src/sq_cli.rs b/tool/src/sq_cli.rs
index 05f981d5..d247e6d7 100644
--- a/tool/src/sq_cli.rs
+++ b/tool/src/sq_cli.rs
@@ -405,9 +405,10 @@ pub fn build() -> App<'static, 'static> {
                                .args(&["can-encrypt", "cannot-encrypt"]))
                         .arg(Arg::with_name("can-encrypt").value_name("PURPOSE")
                              .long("can-encrypt")
-                             .possible_values(&["transport", "rest", "all"])
+                             .possible_values(&["transport", "storage",
+                                                "universal"])
                              .help("The key has an encryption-capable subkey \
-                                    (default)"))
+                                    (default: universal)"))
                         .arg(Arg::with_name("cannot-encrypt")
                              .long("cannot-encrypt")
                              .help("The key will not be able to encrypt data"))