From 3c0d90799fe7c396bc30eefe3ffcf153a23400b8 Mon Sep 17 00:00:00 2001
From: Richard T Bonhomme <tincantech@protonmail.com>
Date: Wed, 7 Dec 2022 23:15:04 +0000
Subject: [PATCH] ff_date_to_cert_date(): Correct the input format for busybox
 date

Also, correct alignment and indents with no functional change.

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

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 3d23c4f..d9e14a4 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -3652,25 +3652,27 @@ ff_date_to_cert_date() {
 	if busybox date --help > /dev/null 2>&1
 	then
 		cert_type_date="$(
-		busybox date -u -D "%b %e %H:%M:%S %Y" -d "$in_date" \
-			"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
-		)"
+			busybox date -u -D "%y-%m-%d %H:%M:%S%Z" \
+				-d "$in_date" \
+				"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
+			)"
 		return
 
 	# Darwin, BSD
 	elif cert_type_date="$(
-		date -u -j -f '%y-%m-%d %TZ' "$in_date" "+%b %d %H:%M:%S %Y %Z" \
-			2>/dev/null
-		)"
+			date -u -j -f '%y-%m-%d %TZ' "$in_date" \
+				"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
+			)"
 	then return
 
 	# OS dependencies
-	# Linux and Windows (FTR: date.exe does not support format +%s as input)
+	# Linux and Windows
+	# * date.exe does not support format +%s as input
 	# MacPorts GNU date
 	elif cert_type_date="$(
-		date -u -d "$in_date" "+%b %d %H:%M:%S %Y %Z" \
-			2>/dev/null
-		)"
+			date -u -d "$in_date" \
+				"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
+			)"
 	then return
 
 	# Something else