From 0d03a6f657c9f695ee49d00be85e845c59d83de0 Mon Sep 17 00:00:00 2001
From: Richard T Bonhomme <tincantech@protonmail.com>
Date: Sun, 2 Oct 2022 17:56:39 +0100
Subject: [PATCH] Remove obsolete command 'renewable'

All valid certificates are renewable.

Closes: #714

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
---
 easyrsa3/easyrsa | 51 ++----------------------------------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index c8e23fc..5a5b889 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -37,7 +37,6 @@ Here is the list of commands available with a short syntax reminder. Use the
   build-serverClient-full <file_name_base> [ cmd-opts ]
   revoke <file_name_base> [cmd-opts]
   renew <file_name_base> [cmd-opts]
-  renewable [ <file_name_base> ]
   revoke-renewed <file_name_base> [cmd-opts]
   rewind-renew <certificate-serial-number>
   rebuild <file_name_base> [cmd-opts]
@@ -192,12 +191,6 @@ cmd_help() {
 
 		opts="
       * nopass  - do not encrypt the private key (default is encrypted)"
-	;;
-	renewable)
-		text="
-* renewable [ <file_name_base> ]
-
-      Check which certificates can be renewed"
 	;;
 	rewind|rewind-renew)
 		text="
@@ -262,7 +255,7 @@ cmd_help() {
 * show-expire [ <file_name_base> ]
 
       Shows details of *all* expiring certificates
-      Use --renew-days=NN to extend the grace period (Default 30 days)
+      Use --renew-days=NN to extend the grace period (Default 90 days)
       Optionally, check *only* <file_name_base> certificate"
 	;;
 	show-revoke)
@@ -400,7 +393,7 @@ cmd_help() {
         eg: '--days=1095 renew server'
       * Expiry days for certificate revokation list.
         eg: '--days=180 gen-crl'
-      * Cutoff days for commands: show-expire or renewable.
+      * Cutoff days for command: show-expire.
         eg: '--days=90 show-expire'"
 	;;
 	--req-cn|req-cn)
@@ -2468,42 +2461,6 @@ revoke_renewed_move() {
 	return 0
 } # => revoke_renewed_move()
 
-# renewable backend
-renewable() {
-	verify_ca_init
-
-	in_dir="$EASYRSA_PKI"
-	MATCH=$(echo "$*" | sed -re 's/\s+/|/g')
-	DATE=$(date --date \
-               "+${EASYRSA_CERT_RENEW} days" \
-               +"%y%m%d%H%M%S")
-        { awkscript=$(cat) ; } <<EOF
-BEGIN { FS = "\t" };
-# Only report valid entries
-\$1 ~ /V/ {
-  # Only consider CN
-  gsub(".*/CN=", "",  \$6);
-  gsub("[^-0-9a-zA-Z.].*", "", \$6);
-  # Only report old enough candidates
-  if (\$2 < "${DATE}") {
-    # Only report matches
-    if (\$6 ~ /(${MATCH})/) {
-      print \$6;
-    }
-  }
-}
-EOF
-	matches=$(awk "$awkscript" "${in_dir}/index.txt")
-	if [ -z "$matches" ] ; then
-		: # ok - Nothing is renewable
-	else
-		print "$matches"
-	fi
-	[ "$EASYRSA_SILENT" ] || print # Separate output above
-
-	return 0
-} # => renewable
-
 # Move renewed certs_by_serial to the new renew layout
 rewind_renew() {
 	# pull filename base: serial number
@@ -5155,10 +5112,6 @@ case "$cmd" in
 		[ "$alias_days" ] && export EASYRSA_CERT_EXPIRE="$alias_days"; :
 		renew "$@"
 		;;
-	renewable)
-		[ "$alias_days" ] && export EASYRSA_CERT_RENEW="$alias_days"; :
-		renewable "$@"
-		;;
 	rewind-renew)
 		rewind_renew "$@"
 		;;