diff options
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/commands/inspect.rs | 2 | ||||
| -rw-r--r-- | tool/src/commands/key.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs index 53bf80e8..87406bae 100644 --- a/tool/src/commands/inspect.rs +++ b/tool/src/commands/inspect.rs @@ -238,7 +238,7 @@ fn inspect_key(policy: &dyn Policy, writeln!(output, "{} Creation time: {}", indent, key.creation_time().convert())?; if let Some(vka) = vka { - if let Some(expires) = vka.key_expiration_time() { + if let Some(expires) = vka.key_validity_period() { let expiration_time = key.creation_time() + expires; writeln!(output, "{}Expiration time: {} (creation time + {})", indent, diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs index 2a9e9cf0..534bfc3f 100644 --- a/tool/src/commands/key.rs +++ b/tool/src/commands/key.rs @@ -41,7 +41,7 @@ pub fn generate(m: &ArgMatches, force: bool) -> failure::Fallible<()> { match m.value_of("expiry") { Some(expiry) if expiry == "never" => - builder = builder.set_expiration_time(None), + builder = builder.set_validity_period(None), Some(expiry) => { let mut expiry = expiry.chars().peekable(); @@ -102,13 +102,13 @@ pub fn generate(m: &ArgMatches, force: bool) -> failure::Fallible<()> { junk, count, factor)); } - builder = builder.set_expiration_time( + builder = builder.set_validity_period( Some(std::time::Duration::new(even_off(count * factor), 0))); } // Not specified. Use the default. None => { - builder = builder.set_expiration_time( + builder = builder.set_validity_period( Some(std::time::Duration::new(even_off(3 * SECONDS_IN_YEAR), 0)) ); } |