From 69424ecedb9529e05b46b1fb253f6dea9c18f9a0 Mon Sep 17 00:00:00 2001
From: Richard T Bonhomme <tincantech@protonmail.com>
Date: Tue, 7 Mar 2023 22:03:23 +0000
Subject: [PATCH] Standardise use of '$# = N' and associated error messages

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

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 478399f..e555e3a 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -636,7 +636,8 @@ secure_session() {
 
 # Create temp-file atomically or fail
 easyrsa_mktemp() {
-	[ "$#" = 1 ] || die "easyrsa_mktemp - invalid input"
+	[ "$#" = 1 ] || die "\
+easyrsa_mktemp - input error"
 
 	# session directory must exist
 	[ "$secured_session" ] || die "\
@@ -3415,7 +3416,9 @@ Failed to perform update-db: see above for related openssl errors."
 
 # Display subjectAltName
 display_san() {
-	[ "$#" = 2 ] || die "display_dn - Incorrect input parameters"
+	[ "$#" = 2 ] || die "\
+display_san - input error"
+
 	format="$1"
 	path="$2"
 	shift 2
@@ -3442,7 +3445,9 @@ display_san() {
 
 # display cert DN info on a req/X509, passed by full pathname
 display_dn() {
-	[ "$#" = 2 ] || die "display_dn - Incorrect input parameters"
+	[ "$#" = 2 ] || die "\
+display_dn - input error"
+
 	format="$1"
 	path="$2"
 	shift 2
@@ -3465,7 +3470,9 @@ display_dn() {
 
 # generate default SAN from req/X509, passed by full pathname
 default_server_san() {
-	[ "$#" = 1 ] || die "display_dn - Incorrect input parameters"
+	[ "$#" = 1 ] || die "\
+default_server_san - input error"
+
 	path="$1"
 	shift
 
@@ -3673,7 +3680,8 @@ OpenSSL failure to process the input"
 # Set fixed offset dates
 fixed_cert_dates() {
 	# check input
-	[ "$#" -eq 3 ] || die "fixed_cert_dates - input error"
+	[ "$#" = 3 ] || die "\
+fixed_cert_dates - input error"
 
 	# Set the start fixed day-number of the Year
 	start_fix_day_n="$1"
@@ -3823,7 +3831,7 @@ fixed_cert_dates - force_set_var - $3 - $end_fix_day_d"
 # Convert certificate date to timestamp seconds since epoch
 cert_date_to_timestamp_s() {
 	# check input
-	[ "$#" -eq 2 ] || die "\
+	[ "$#" = 2 ] || die "\
 cert_date_to_timestamp_s - input error"
 
 	in_date="$1"
@@ -3872,7 +3880,7 @@ cert_date_to_timestamp_s - force_set_var - $2 - $timestamp_s"
 # to X509 certificate style date (+)offset
 offset_days_to_cert_date() {
 	# check input
-	[ "$#" -eq 2 ] || die "\
+	[ "$#" = 2 ] || die "\
 offset_days_to_cert_date - input error"
 
 	in_offset="$1"
@@ -3926,7 +3934,7 @@ offset_days_to_cert_date \
 # Convert fixed format date to X509 certificate style date
 ff_date_to_cert_date() {
 	# check input
-	[ "$#" -eq 2 ] || die "\
+	[ "$#" = 2 ] || die "\
 ff_date_to_cert_date - input error"
 
 	in_date="$1"
@@ -3980,7 +3988,7 @@ ff_date_to_cert_date \
 # Build a Windows date.exe compatible input field
 db_date_to_ff_date() {
 	# check input
-	[ "$#" -eq 2 ] || die "\
+	[ "$#" = 2 ] || die "\
 db_date_to_ff_date - input error"
 
 	in_date="$1"
@@ -4010,14 +4018,14 @@ db_date_to_ff_date \
 
 # sanatize and set var
 force_set_var() {
-	[ "$#" -eq 2 ] || die "force_set_var - input"
+	[ "$#" = 2 ] || die "force_set_var - input"
 	unset -v "$1" || die "force_set_var - unset"
 	set_var "$1" "$2" || die "force_set_var - set_var"
 } # => force_set_var()
 
 # get the serial number of the certificate -> serial=XXXX
 ssl_cert_serial() {
-	[ "$#" = 2 ] || die "ssl_cert_serial - invalid input"
+	[ "$#" = 2 ] || die "ssl_cert_serial - input error"
 	[ -f "$1" ] || die "ssl_cert_serial - missing cert"
 
 	fn_ssl_out="$(
@@ -4035,7 +4043,7 @@ ssl_cert_serial() {
 # Get certificate start date
 ssl_cert_not_before_date() {
 	[ "$#" = 2 ] || die "\
-ssl_cert_not_before_date - invalid input"
+ssl_cert_not_before_date - input error"
 	[ -f "$1" ] || die "\
 ssl_cert_not_before_date - missing cert"
 
@@ -4055,7 +4063,7 @@ ssl_cert_not_before_date - failed to set var '$*'"
 # Get certificate end date
 ssl_cert_not_after_date() {
 	[ "$#" = 2 ] || die "\
-ssl_cert_not_after_date - invalid input"
+ssl_cert_not_after_date - input error"
 	[ -f "$1" ] || die "\
 ssl_cert_not_after_date - missing cert"
 
@@ -4308,7 +4316,7 @@ serial mismatch:
 # cert status reports
 status() {
 
-	[ "$#" -gt 0 ] || die "status - Incorrect input parameters"
+	[ "$#" -gt 0 ] || die "status - input error"
 	report="$1"
 	target="$2"