From 2a6e574b90a4f21f8e4af88758b2f96742e9c408 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 19 Feb 2024 20:46:42 -0500
Subject: [PATCH 1/2] Shorten expire CLI arg

---
 README.md   |  6 +++---
 src/main.rs | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 6fd3f11..c553577 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Options:
           Server cert: city or locality
       --srv-org <SRV_ORG>
           Server cert: organization
-      --srv-expire-days <SRV_EXPIRE_DAYS>
+      --srv-expire <SRV_EXPIRE>
           Server cert: days until expiration [default: 365]
 
       --ca-common-name <CA_COMMON_NAME>
@@ -63,7 +63,7 @@ Options:
           CA cert: city or locality
       --ca-org <CA_ORG>
           CA cert: organization
-      --ca-expire-days <CA_EXPIRE_DAYS>
+      --ca-expire <CA_EXPIRE>
           CA cert: days until expiration [default: 365]
 
       --common-name <COMMON_NAME>
@@ -76,7 +76,7 @@ Options:
           city or locality: Default set for both CA and server certs
       --org <ORG>
           organization: Default set for both CA and server certs
-      --expire-days <EXPIRE_DAYS>
+      --expire <EXPIRE>
           expire days:  Default set for both CA and server certs
 
   -h, --help
diff --git a/src/main.rs b/src/main.rs
index 76e702d..7ba05d5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -75,7 +75,7 @@ struct Args {
 
     /// Server cert: days until expiration
     #[arg(long, default_value_t = 365)]
-    srv_expire_days: u32,
+    srv_expire: u32,
 
     /// CA cert: common name
     #[arg(long, default_value = "127.0.0.1")]
@@ -99,7 +99,7 @@ struct Args {
 
     /// CA cert: days until expiration
     #[arg(long, default_value_t = 365)]
-    ca_expire_days: u32,
+    ca_expire: u32,
 
     /// common name: Default set for both CA and server certs.
     #[arg(long)]
@@ -123,7 +123,7 @@ struct Args {
 
     /// expire days:  Default set for both CA and server certs.
     #[arg(long)]
-    expire_days: Option<u32>,
+    expire: Option<u32>,
 }
 
 /// Process CLI args that assign two settings simultaneously
@@ -163,10 +163,10 @@ fn swizzle_args(args: &mut Args) {
         }
         None => {}
     }
-    match &args.expire_days {
+    match &args.expire {
         Some(val) => {
-            args.ca_expire_days = *val;
-            args.srv_expire_days = *val;
+            args.ca_expire = *val;
+            args.srv_expire = *val;
         }
         None => {}
     }
@@ -211,7 +211,7 @@ fn create_root_ca_certificate(args: &Args, pkey: &PKey<Private>) -> Result<X509,
     builder.set_pubkey(pkey)?;
 
     let not_before = Asn1Time::days_from_now(0)?;
-    let not_after = Asn1Time::days_from_now(args.ca_expire_days)?;
+    let not_after = Asn1Time::days_from_now(args.ca_expire)?;
     builder.set_not_before(&not_before)?;
     builder.set_not_after(&not_after)?;
 
@@ -303,7 +303,7 @@ fn sign_server_csr(
 
     // Set validity
     let not_before = openssl::asn1::Asn1Time::days_from_now(0)?;
-    let not_after = openssl::asn1::Asn1Time::days_from_now(args.srv_expire_days)?;
+    let not_after = openssl::asn1::Asn1Time::days_from_now(args.srv_expire)?;
     builder.set_not_before(&not_before)?;
     builder.set_not_after(&not_after)?;
 

From 41fa370d13b233dd9e67b8868a069c2e379793b9 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 19 Feb 2024 20:48:00 -0500
Subject: [PATCH 2/2] Version 1.0.1

---
 Cargo.lock | 14 +++++++-------
 Cargo.toml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9bbfe0b..908a50d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -152,9 +152,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
-version = "0.10.63"
+version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -178,9 +178,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.99"
+version = "0.9.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
+checksum = "ae94056a791d0e1217d18b6cbdccb02c61e3054fc69893607f4067e3bb0b1fd1"
 dependencies = [
  "cc",
  "libc",
@@ -214,7 +214,7 @@ dependencies = [
 
 [[package]]
 name = "self-signed-cert"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "clap",
  "openssl",
@@ -228,9 +228,9 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "syn"
-version = "2.0.49"
+version = "2.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
+checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index ad6f42a..ed73474 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "self-signed-cert"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Jeff Garzik"]
 edition = "2021"
 description = "Tool to generate self-signed root CA, web server certs and keys"