Renamed purgex509/crl to purgecerts/crls to be consistent with list commands

6 files changed, 17 insertions, 17 deletions

diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in
index 362ee4e3d..2ea0ef798 100755
--- a/src/ipsec/ipsec.in
+++ b/src/ipsec/ipsec.in
@@ -65,7 +65,7 @@ case "$1" in
 	echo "	rereadsecrets|rereadgroups"
 	echo "	rereadcacerts|rereadaacerts|rereadocspcerts"
 	echo "	rereadacerts|rereadcrls|rereadall"
-	echo "	purgeocsp|purgecrl|purgex509|purgeike"
+	echo "	purgeocsp|purgecrls|purgecerts|purgeike"
 	echo "	scencrypt|scdecrypt <value> [--inbase <base>] [--outbase <base>] [--keyid <id>]"
 	echo "	openac"
 	echo "	pluto"
@@ -191,11 +191,11 @@ rereadall|purgeocsp)
 	fi
 	exit "$rc"
 	;;
-purgeike|purgecrl|purgex509)
+purgeike|purgecrls|purgecerts)
 	rc=7
 	if [ -e $IPSEC_CHARON_PID ]
 	then
-		$IPSEC_STROKE purgeike
+		$IPSEC_STROKE "$1"
 		rc="$?"
 	fi
 	exit "$rc"
diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c
index aa665cfa0..3762ffcad 100644
--- a/src/libcharon/plugins/stroke/stroke_socket.c
+++ b/src/libcharon/plugins/stroke/stroke_socket.c
@@ -359,11 +359,11 @@ static void stroke_purge(private_stroke_socket_t *this,
 	{
 		lib->credmgr->flush_cache(lib->credmgr, CERT_X509_OCSP_RESPONSE);
 	}
-	if (msg->purge.flags & PURGE_CRL)
+	if (msg->purge.flags & PURGE_CRLS)
 	{
 		lib->credmgr->flush_cache(lib->credmgr, CERT_X509_CRL);
 	}
-	if (msg->purge.flags & PURGE_X509)
+	if (msg->purge.flags & PURGE_CERTS)
 	{
 		lib->credmgr->flush_cache(lib->credmgr, CERT_X509);
 	}
diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c
index 8b43b6d60..a88fa10d7 100644
--- a/src/stroke/stroke.c
+++ b/src/stroke/stroke.c
@@ -286,8 +286,8 @@ static int reread(stroke_keyword_t kw)
 static int purge_flags[] = {
 	PURGE_OCSP,
 	PURGE_IKE,
-	PURGE_CRL,
-	PURGE_X509,
+	PURGE_CRLS,
+	PURGE_CERTS,
 };
 
 static int purge(stroke_keyword_t kw)
@@ -386,9 +386,9 @@ static void exit_usage(char *error)
 	printf("  Purge ocsp cache entries:\n");
 	printf("    stroke purgeocsp\n");
 	printf("  Purge CRL cache entries:\n");
-	printf("    stroke purgecrl\n");
+	printf("    stroke purgecrls\n");
 	printf("  Purge X509 cache entries:\n");
-	printf("    stroke purgex509\n");
+	printf("    stroke purgecerts\n");
 	printf("  Purge IKE_SAs without a CHILD_SA:\n");
 	printf("    stroke purgeike\n");
 	printf("  Export credentials to the console:\n");
@@ -514,8 +514,8 @@ int main(int argc, char *argv[])
 			res = reread(token->kw);
 			break;
 		case STROKE_PURGE_OCSP:
-		case STROKE_PURGE_CRL:
-		case STROKE_PURGE_X509:
+		case STROKE_PURGE_CRLS:
+		case STROKE_PURGE_CERTS:
 		case STROKE_PURGE_IKE:
 			res = purge(token->kw);
 			break;
diff --git a/src/stroke/stroke_keywords.h b/src/stroke/stroke_keywords.h
index 71e67c31e..ff2ba36ef 100644
--- a/src/stroke/stroke_keywords.h
+++ b/src/stroke/stroke_keywords.h
@@ -49,8 +49,8 @@ typedef enum {
 	STROKE_REREAD_CRLS,
 	STROKE_REREAD_ALL,
 	STROKE_PURGE_OCSP,
-	STROKE_PURGE_CRL,
-	STROKE_PURGE_X509,
+	STROKE_PURGE_CRLS,
+	STROKE_PURGE_CERTS,
 	STROKE_PURGE_IKE,
 	STROKE_EXPORT_X509,
 	STROKE_LEASES,
diff --git a/src/stroke/stroke_keywords.txt b/src/stroke/stroke_keywords.txt
index 099038c2b..dafd1ab08 100644
--- a/src/stroke/stroke_keywords.txt
+++ b/src/stroke/stroke_keywords.txt
@@ -56,8 +56,8 @@ rereadacerts,    STROKE_REREAD_ACERTS
 rereadcrls,      STROKE_REREAD_CRLS
 rereadall,       STROKE_REREAD_ALL
 purgeocsp,       STROKE_PURGE_OCSP
-purgecrl,        STROKE_PURGE_CRL
-purgex509,       STROKE_PURGE_X509
+purgecrls,       STROKE_PURGE_CRLS
+purgecerts,      STROKE_PURGE_CERTS
 purgeike,        STROKE_PURGE_IKE
 exportx509,      STROKE_EXPORT_X509
 leases,          STROKE_LEASES
diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
index 64d9aa7b9..aeb4b6835 100644
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -108,9 +108,9 @@ enum purge_flag_t {
 	/** purge IKE_SAs without a CHILD_SA */
 	PURGE_IKE =			0x0002,
 	/** purge CRL cache entries */
-	PURGE_CRL =			0x0004,
+	PURGE_CRLS =		0x0004,
 	/** purge X509 cache entries */
-	PURGE_X509 =		0x0008,
+	PURGE_CERTS =		0x0008,
 };
 
 typedef enum export_flag_t export_flag_t;