diff options
| author | Leonhard Markert <curiousleo@users.noreply.github.com> | 2019-11-13 21:20:24 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-11-15 12:54:45 +0100 |
| commit | 7735b05e8cf82ae943e8b7b0dfed4a26cd6c3db4 (patch) | |
| tree | a81bc7ea466fb7168aa6f766751f43daaf363f6f /tool | |
| parent | c08eff5da06ae6df459d1e45133c2113557927fe (diff) | |
openpgp: Add tpk::builder::CipherSuite::RSA4k.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/commands/key.rs | 3 | ||||
| -rw-r--r-- | tool/src/sq-usage.rs | 2 | ||||
| -rw-r--r-- | tool/src/sq_cli.rs | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs index 1fda1bd7..5351c575 100644 --- a/tool/src/commands/key.rs +++ b/tool/src/commands/key.rs @@ -118,6 +118,9 @@ pub fn generate(m: &ArgMatches, force: bool) -> failure::Fallible<()> { None | Some("rsa3k") => { builder = builder.set_cipher_suite(CipherSuite::RSA3k); } + Some("rsa4k") => { + builder = builder.set_cipher_suite(CipherSuite::RSA4k); + } Some("cv25519") => { builder = builder.set_cipher_suite(CipherSuite::Cv25519); } diff --git a/tool/src/sq-usage.rs b/tool/src/sq-usage.rs index 554f7d08..24d5ecc5 100644 --- a/tool/src/sq-usage.rs +++ b/tool/src/sq-usage.rs @@ -487,7 +487,7 @@ //! --can-encrypt <PURPOSE> The key has an encryption-capable subkey (default) [possible values: transport, //! rest, all] //! -c, --cipher-suite <CIPHER-SUITE> Cryptographic algorithms used for the key. [default: cv25519] [possible -//! values: rsa3k, cv25519] +//! values: rsa3k, rsa4k, cv25519] //! --expiry <EXPIRY> When the key should expire. Either 'N[ymwd]', for N years, months, weeks, or //! days, or 'never'. //! -e, --export <OUTFILE> Exports the key instead of saving it in the store diff --git a/tool/src/sq_cli.rs b/tool/src/sq_cli.rs index 1ac93d33..f81b0106 100644 --- a/tool/src/sq_cli.rs +++ b/tool/src/sq_cli.rs @@ -371,7 +371,7 @@ pub fn build() -> App<'static, 'static> { .value_name("CIPHER-SUITE") .long("cipher-suite") .short("c") - .possible_values(&["rsa3k", "cv25519"]) + .possible_values(&["rsa3k", "rsa4k", "cv25519"]) .default_value("cv25519") .help("Cryptographic algorithms used for the key.")) .arg(Arg::with_name("with-password") |