Merge branch 'TinCanTech-bug-revoke-source-dir'

Signed-off-by: Richard T Bonhomme <[email protected]>
OpenVPN · Jul 25, 2024 · 6204742 · 6204742
2 parents f0b22c4 + ff504b7
commit 6204742
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
 
 3.2.1 (TBD)
 
+   * bug-fix: revoke: Pass the correct certificate location (24d5514)
    * vars.example: Add flags for auto-SAN and X509 critical attribute (a41dfcc)
    * Global option --eku-crit: Mark X509 extendedKeyUsage as critical (ca09211)
    * sign-req: Add critical and pathlen details to confirmation (deae705) (#1182)

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
@@ -3171,7 +3171,7 @@ issued certificate:${NL}
 		# Revoking an issued cert forces req/key to be moved
 		move_req_and_key=1
 	;;
-	expired|renewed)
+	expired|renewed/issued)
 		# Revoke-expired/renewed cert means req/key can remain
 		move_req_and_key=
 	;;
@@ -5861,7 +5861,7 @@ case "$cmd" in
 		;;
 	revoke-renewed)
 		verify_working_env
-		cert_dir=renewed
+		cert_dir=renewed/issued
 		revoke "$@"
 		;;
 	renew)