misc updates

[vpn-prov.git] / easy-rsa / revoke-full

diff --git a/easy-rsa/revoke-full b/easy-rsa/revoke-full
index 439f6a032f009ee29f0ae9e888b2af1d11a4f814..d3514e4f56e23596f527b6ae5825f2b3f1435d1b 100755 (executable)
--- a/easy-rsa/revoke-full
+++ b/easy-rsa/revoke-full
@@ -21,7 +21,15 @@ if [ "$KEY_DIR" ]; then
     export KEY_NAME=""
 
     # revoke key and generate a new CRL
-    $OPENSSL ca -revoke "$1.crt" -config "$KEY_CONFIG"
+    if [ -f "$1.crt" ]; then
+        crtname="$1.crt"
+    elif [ -f "$1.pem" ]; then
+        crtname="$1.pem"
+    else
+        echo "That certificate doesn't exist ($1.crt or $1.pem)"
+        exit
+    fi
+    $OPENSSL ca -revoke "$crtname" -config "$KEY_CONFIG"
 
     # generate a new CRL -- try to be compatible with
     # intermediate PKIs
@@ -33,7 +41,7 @@ if [ "$KEY_DIR" ]; then
     fi
 
     # verify the revocation
-    $OPENSSL verify -CAfile "$RT" -crl_check "$1.crt"
+    $OPENSSL verify -CAfile "$RT" -crl_check "$crtname"
 else
     echo 'Please source the vars script first (i.e. "source ./vars")'
     echo 'Make sure you have edited it to reflect your configuration.'