Merge branch 'TinCanTech-check-start-end-date'

Signed-off-by: Richard T Bonhomme <[email protected]>

Author: TinCanTech

ChangeLog

@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
 
 3.2.4 (TBD)
 
+   * mutual_exclusions(): Include basic checks for --startdate/--enddate (e1478c3) (#1372)
    * Windows easyrsa-shell-init.sh: Replace 'read -p' (49b2181) (#1371)
    * inline: Include missing OpenVPN TLS key to cause INCOMPLETE warning (d98eee6) (#1368)
    * Verbose: Make verbose messages command and function aware (7634b94) (#1368)

easyrsa3/easyrsa

@@ -56,8 +56,8 @@ Certificate & Request options: (these impact cert/req field values)
 --notext|no-text: Create certificates without human readable text
 --days=#        : Sets the signing validity to the specified number of days
                   Applies to other commands. For details, see: 'help days'
---startdate=DATE: Sets the SSL option '-startdate' (Format 'YYYYMMDDhhmmssZ')
---enddate=DATE  : Sets the SSL option '-enddate' (Format 'YYYYMMDDhhmmssZ')
+--startdate=DATE: Sets the SSL option '-startdate' (Format '[YY]YYMMDDhhmmssZ')
+--enddate=DATE  : Sets the SSL option '-enddate' (Format '[YY]YYMMDDhhmmssZ')
 
 --digest=ALG    : Digest to use in the requests & certificates
 --keysize=#     : Size in bits of keypair to generate (RSA Only)
@@ -5446,6 +5446,19 @@ Option --silent-ssl requires batch mode --batch."
 Use of --startdate requires use of --enddate."
 	fi
 
+	# Basic --startdate/--enddate check
+	case "${#EASYRSA_START_DATE}" in
+		0|13|15) : ;; # ok
+		*) user_error "\
+Format of --startdate/--enddate must be [YY]YYMMDDhhmmssZ"
+	esac
+
+	case "${#EASYRSA_END_DATE}" in
+		0|13|15) : ;; # ok
+		*) user_error "\
+Format of --startdate/--enddate must be [YY]YYMMDDhhmmssZ"
+	esac
+
 	# --enddate may over-rule EASYRSA_CERT_EXPIRE
 	if [ "$EASYRSA_END_DATE" ]; then
 		case "$cmd" in