From 09c5684fc54c51f5b62f2a11488a348adecc0b24 Mon Sep 17 00:00:00 2001
From: Richard T Bonhomme <tincantech@protonmail.com>
Date: Mon, 27 Mar 2023 21:48:48 +0100
Subject: [PATCH] +ff_date_to_cert_date(): Prioritise standard date over
 busybox date

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

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 2299b89..6d465ca 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -3813,16 +3813,16 @@ ff_date_to_cert_date - input error"
 
 	in_date="$1"
 
-	# busybox
-	if busybox date --help > /dev/null 2>&1
-	then
-		out_date="$(
-			busybox date -u \
-				-D "%y-%m-%d %H:%M:%S%Z" \
-				-d "$in_date" "+%b %d %H:%M:%S %Y %Z" \
+	# OS dependencies
+	# Linux and Windows
+	# * date.exe does not support format +%s as input
+	# MacPorts GNU date
+	if out_date="$(
+			date -u -d "$in_date" \
+				"+%b %d %H:%M:%S %Y %Z" \
 				2>/dev/null
-			)" || die "\
-ff_date_to_cert_date - out_date - busybox"
+			)"
+	then : # ok
 
 	# Darwin, BSD
 	elif out_date="$(
@@ -3832,16 +3832,16 @@ ff_date_to_cert_date - out_date - busybox"
 			)"
 	then : # ok
 
-	# OS dependencies
-	# Linux and Windows
-	# * date.exe does not support format +%s as input
-	# MacPorts GNU date
-	elif out_date="$(
-			date -u -d "$in_date" \
-				"+%b %d %H:%M:%S %Y %Z" \
+	# busybox
+	elif busybox date --help > /dev/null 2>&1
+	then
+		out_date="$(
+			busybox date -u \
+				-D "%y-%m-%d %H:%M:%S%Z" \
+				-d "$in_date" "+%b %d %H:%M:%S %Y %Z" \
 				2>/dev/null
-			)"
-	then : # ok
+			)" || die "\
+ff_date_to_cert_date - out_date - busybox"
 
 	# Something else
 	else