Get rid of ASN1_ITEM_FUNCTIONS dummy function

prototype hack. This unfortunately means that
every ASN1_*_END construct cannot have a
trailing ;

35 files changed, 101 insertions, 102 deletions

diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h
index 94749cfe0e..7d01df0674 100644
--- a/crypto/asn1/asn1t.h
+++ b/crypto/asn1/asn1t.h
@@ -86,7 +86,7 @@ extern "C" {
 	OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
 
 #define ASN1_ITEM_end(itname) \
-		}
+		};
 
 #else
 
@@ -104,8 +104,7 @@ extern "C" {
 #define ASN1_ITEM_end(itname) \
 		}; \
 	return &local_it; \
-	}\
-	void dummy_function(void)
+	}
 
 #endif
 
@@ -134,7 +133,7 @@ extern "C" {
  *
  * 	ASN1_SEQUENCE(stname) = {
  * 		... SEQUENCE components ...
- * 	} ASN1_SEQUENCE_END(stname);
+ * 	} ASN1_SEQUENCE_END(stname)
  *
  * 	This will produce an ASN1_ITEM called stname_it
  *	for a structure called stname.
@@ -144,7 +143,7 @@ extern "C" {
  *
  * 	ASN1_SEQUENCE(itname) = {
  * 		... SEQUENCE components ...
- * 	} ASN1_SEQUENCE_END_name(stname, itname);
+ * 	} ASN1_SEQUENCE_END_name(stname, itname)
  *
  *	This will create an item called itname_it using
  *	a structure called stname.
@@ -206,7 +205,7 @@ extern "C" {
  *
  * 	ASN1_CHOICE(chname) = {
  * 		... CHOICE options ...
- * 	ASN1_CHOICE_END(chname);
+ * 	ASN1_CHOICE_END(chname)
  *
  * 	This will produce an ASN1_ITEM called chname_it
  *	for a structure called chname. The structure
@@ -695,13 +694,13 @@ typedef struct ASN1_AUX_st {
 #define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
 				ASN1_ITEM_start(itname) \
 					ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
-				ASN1_ITEM_end(itname);
+				ASN1_ITEM_end(itname)
 
 /* Macro to implement a multi string type */
 #define IMPLEMENT_ASN1_MSTRING(itname, mask) \
 				ASN1_ITEM_start(itname) \
 					ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
-				ASN1_ITEM_end(itname);
+				ASN1_ITEM_end(itname)
 
 /* Macro to implement an ASN1_ITEM in terms of old style funcs */
 
@@ -722,7 +721,7 @@ typedef struct ASN1_AUX_st {
 		&sname##_ff, \
 		0, \
 		#sname \
-	ASN1_ITEM_end(sname);
+	ASN1_ITEM_end(sname)
 
 #define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
 	ASN1_ITEM_start(sname) \
@@ -733,7 +732,7 @@ typedef struct ASN1_AUX_st {
 		&fptrs, \
 		0, \
 		#sname \
-	ASN1_ITEM_end(sname);
+	ASN1_ITEM_end(sname)
 
 /* Macro to implement standard functions in terms of ASN1_ITEM structures */
 
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index c9d834966a..9bfd0218ab 100644
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -90,7 +90,7 @@ typedef struct netscape_encrypted_pkey_st
 ASN1_BROKEN_SEQUENCE(NETSCAPE_ENCRYPTED_PKEY) = {
 	ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, os, ASN1_OCTET_STRING),
 	ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, enckey, X509_SIG)
-} ASN1_BROKEN_SEQUENCE_END(NETSCAPE_ENCRYPTED_PKEY);
+} ASN1_BROKEN_SEQUENCE_END(NETSCAPE_ENCRYPTED_PKEY)
 
 IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY)
 
@@ -98,7 +98,7 @@ ASN1_SEQUENCE(NETSCAPE_PKEY) = {
 	ASN1_SIMPLE(NETSCAPE_PKEY, version, LONG),
 	ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR),
 	ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(NETSCAPE_PKEY);
+} ASN1_SEQUENCE_END(NETSCAPE_PKEY)
 
 IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_PKEY)
 
diff --git a/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c
index 36e5dce359..50e2d4d07a 100644
--- a/crypto/asn1/nsseq.c
+++ b/crypto/asn1/nsseq.c
@@ -77,6 +77,6 @@ static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
 ASN1_SEQUENCE_cb(NETSCAPE_CERT_SEQUENCE, nsseq_cb) = {
 	ASN1_SIMPLE(NETSCAPE_CERT_SEQUENCE, type, ASN1_OBJECT),
 	ASN1_EXP_SEQUENCE_OF_OPT(NETSCAPE_CERT_SEQUENCE, certs, X509, 0)
-} ASN1_SEQUENCE_END_cb(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE);
+} ASN1_SEQUENCE_END_cb(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
 
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)
diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index eedeb9ee3e..891150638e 100644
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -67,7 +67,7 @@
 ASN1_SEQUENCE(PBEPARAM) = {
 	ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
 	ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(PBEPARAM);
+} ASN1_SEQUENCE_END(PBEPARAM)
 
 IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
 
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index 82526f38fd..cd597ff418 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -67,7 +67,7 @@
 ASN1_SEQUENCE(PBE2PARAM) = {
 	ASN1_SIMPLE(PBE2PARAM, keyfunc, X509_ALGOR),
 	ASN1_SIMPLE(PBE2PARAM, encryption, X509_ALGOR)
-} ASN1_SEQUENCE_END(PBE2PARAM);
+} ASN1_SEQUENCE_END(PBE2PARAM)
 
 IMPLEMENT_ASN1_FUNCTIONS(PBE2PARAM)
 
@@ -76,7 +76,7 @@ ASN1_SEQUENCE(PBKDF2PARAM) = {
 	ASN1_SIMPLE(PBKDF2PARAM, iter, ASN1_INTEGER),
 	ASN1_OPT(PBKDF2PARAM, keylength, ASN1_INTEGER),
 	ASN1_OPT(PBKDF2PARAM, prf, X509_ALGOR)
-} ASN1_SEQUENCE_END(PBKDF2PARAM);
+} ASN1_SEQUENCE_END(PBKDF2PARAM)
 
 IMPLEMENT_ASN1_FUNCTIONS(PBKDF2PARAM)
 
diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c
index e218899985..b634d5bc85 100644
--- a/crypto/asn1/p8_pkey.c
+++ b/crypto/asn1/p8_pkey.c
@@ -79,6 +79,6 @@ ASN1_SEQUENCE_cb(PKCS8_PRIV_KEY_INFO, pkey_cb) = {
 	ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkeyalg, X509_ALGOR),
 	ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkey, ASN1_ANY),
 	ASN1_IMP_SET_OF_OPT(PKCS8_PRIV_KEY_INFO, attributes, X509_ATTRIBUTE, 0)
-} ASN1_SEQUENCE_END_cb(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO);
+} ASN1_SEQUENCE_END_cb(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
index c1cf2a5f8e..f135598ad3 100644
--- a/crypto/asn1/x_algor.c
+++ b/crypto/asn1/x_algor.c
@@ -64,7 +64,7 @@
 ASN1_SEQUENCE(X509_ALGOR) = {
 	ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),
 	ASN1_OPT(X509_ALGOR, parameter, ASN1_ANY)
-} ASN1_SEQUENCE_END(X509_ALGOR);
+} ASN1_SEQUENCE_END(X509_ALGOR)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR)
 
diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c
index 3c0d3ab759..959e1ad42e 100644
--- a/crypto/asn1/x_attrib.c
+++ b/crypto/asn1/x_attrib.c
@@ -85,13 +85,13 @@
 ASN1_CHOICE(X509_ATTRIBUTE_SET) = {
 	ASN1_SET_OF(X509_ATTRIBUTE, value.set, ASN1_ANY),
 	ASN1_SIMPLE(X509_ATTRIBUTE, value.single, ASN1_ANY)
-} ASN1_CHOICE_END_selector(X509_ATTRIBUTE, X509_ATTRIBUTE_SET, single);
+} ASN1_CHOICE_END_selector(X509_ATTRIBUTE, X509_ATTRIBUTE_SET, single)
 
 ASN1_SEQUENCE(X509_ATTRIBUTE) = {
 	ASN1_SIMPLE(X509_ATTRIBUTE, object, ASN1_OBJECT),
 	/* CHOICE type merged with parent */
 	ASN1_EX_COMBINE(0, 0, X509_ATTRIBUTE_SET)
-} ASN1_SEQUENCE_END(X509_ATTRIBUTE);
+} ASN1_SEQUENCE_END(X509_ATTRIBUTE)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_ATTRIBUTE)
 
diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index e7004ccfae..848c7a0877 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -85,11 +85,11 @@ static ASN1_PRIMITIVE_FUNCS bignum_pf = {
 
 ASN1_ITEM_start(BIGNUM)
 	ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &bignum_pf, 0, "BIGNUM"
-ASN1_ITEM_end(BIGNUM);
+ASN1_ITEM_end(BIGNUM)
 
 ASN1_ITEM_start(CBIGNUM)
 	ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &bignum_pf, BN_SENSITIVE, "BIGNUM"
-ASN1_ITEM_end(CBIGNUM);
+ASN1_ITEM_end(CBIGNUM)
 
 static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c
index bf13df8161..8843f34138 100644
--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -70,7 +70,7 @@ ASN1_SEQUENCE(X509_REVOKED) = {
 	ASN1_SIMPLE(X509_REVOKED,serialNumber, ASN1_INTEGER),
 	ASN1_SIMPLE(X509_REVOKED,revocationDate, ASN1_TIME),
 	ASN1_SEQUENCE_OF_OPT(X509_REVOKED,extensions, X509_EXTENSION)
-} ASN1_SEQUENCE_END(X509_REVOKED);
+} ASN1_SEQUENCE_END(X509_REVOKED)
 
 /* The X509_CRL_INFO structure needs a bit of customisation. This is actually
  * mirroring the old behaviour: its purpose is to allow the use of
@@ -116,13 +116,13 @@ ASN1_SEQUENCE_cb(X509_CRL_INFO, crl_inf_cb) = {
 	ASN1_OPT(X509_CRL_INFO, nextUpdate, ASN1_TIME),
 	ASN1_SEQUENCE_OF_OPT(X509_CRL_INFO, revoked, X509_REVOKED),
 	ASN1_EXP_SEQUENCE_OF_OPT(X509_CRL_INFO, extensions, X509_EXTENSION, 0)
-} ASN1_SEQUENCE_END_cb(X509_CRL_INFO, X509_CRL_INFO);
+} ASN1_SEQUENCE_END_cb(X509_CRL_INFO, X509_CRL_INFO)
 
 ASN1_SEQUENCE_ref(X509_CRL, 0, CRYPTO_LOCK_X509_CRL) = {
 	ASN1_SIMPLE(X509_CRL, crl, X509_CRL_INFO),
 	ASN1_SIMPLE(X509_CRL, sig_alg, X509_ALGOR),
 	ASN1_SIMPLE(X509_CRL, signature, ASN1_BIT_STRING)
-} ASN1_SEQUENCE_END_ref(X509_CRL, X509_CRL);
+} ASN1_SEQUENCE_END_ref(X509_CRL, X509_CRL)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
 IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO)
diff --git a/crypto/asn1/x_exten.c b/crypto/asn1/x_exten.c
index 97e13f8dd1..d55c0528a3 100644
--- a/crypto/asn1/x_exten.c
+++ b/crypto/asn1/x_exten.c
@@ -65,6 +65,6 @@ ASN1_SEQUENCE(X509_EXTENSION) = {
 	ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),
 	ASN1_OPT(X509_EXTENSION, critical, ASN1_BOOLEAN),
 	ASN1_SIMPLE(X509_EXTENSION, value, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(X509_EXTENSION);
+} ASN1_SEQUENCE_END(X509_EXTENSION)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_EXTENSION)
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index 0b9248d37f..c04b192794 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -82,11 +82,11 @@ static ASN1_PRIMITIVE_FUNCS long_pf = {
 
 ASN1_ITEM_start(LONG)
 	ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &long_pf, ASN1_LONG_UNDEF, "LONG"
-ASN1_ITEM_end(LONG);
+ASN1_ITEM_end(LONG)
 
 ASN1_ITEM_start(ZLONG)
 	ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &long_pf, 0, "ZLONG"
-ASN1_ITEM_end(ZLONG);
+ASN1_ITEM_end(ZLONG)
 
 static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c
index da7fccb995..34f4e4c3f6 100644
--- a/crypto/asn1/x_name.c
+++ b/crypto/asn1/x_name.c
@@ -73,7 +73,7 @@ static int x509_name_encode(X509_NAME *a);
 ASN1_SEQUENCE(X509_NAME_ENTRY) = {
 	ASN1_SIMPLE(X509_NAME_ENTRY, object, ASN1_OBJECT),
 	ASN1_SIMPLE(X509_NAME_ENTRY, value, ASN1_PRINTABLE)
-} ASN1_SEQUENCE_END(X509_NAME_ENTRY);
+} ASN1_SEQUENCE_END(X509_NAME_ENTRY)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_NAME_ENTRY)
 
@@ -83,11 +83,11 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_NAME_ENTRY)
 
 ASN1_ITEM_TEMPLATE(X509_NAME_ENTRIES) =
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, RDNS, X509_NAME_ENTRY)
-ASN1_ITEM_TEMPLATE_END(X509_NAME_ENTRIES);
+ASN1_ITEM_TEMPLATE_END(X509_NAME_ENTRIES)
 
 ASN1_ITEM_TEMPLATE(X509_NAME_INTERNAL) =
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Name, X509_NAME_ENTRIES)
-ASN1_ITEM_TEMPLATE_END(X509_NAME_INTERNAL);
+ASN1_ITEM_TEMPLATE_END(X509_NAME_INTERNAL)
 
 /* Normally that's where it would end: we'd have two nested STACK structures
  * representing the ASN1. Unfortunately X509_NAME uses a completely different
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index 7dcf5bce2f..c4a849aff1 100644
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -74,7 +74,7 @@ static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
 ASN1_SEQUENCE_cb(X509_PUBKEY, pubkey_cb) = {
 	ASN1_SIMPLE(X509_PUBKEY, algor, X509_ALGOR),
 	ASN1_SIMPLE(X509_PUBKEY, public_key, ASN1_BIT_STRING)
-} ASN1_SEQUENCE_END_cb(X509_PUBKEY, X509_PUBKEY);
+} ASN1_SEQUENCE_END_cb(X509_PUBKEY, X509_PUBKEY)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_PUBKEY)
 
diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c
index 84a5ca65df..59bb3dee75 100644
--- a/crypto/asn1/x_req.c
+++ b/crypto/asn1/x_req.c
@@ -98,7 +98,7 @@ ASN1_SEQUENCE_enc(X509_REQ_INFO, enc, rinf_cb) = {
 	 * encodings
 	 */
 	ASN1_IMP_SET_OF_OPT(X509_REQ_INFO, attributes, X509_ATTRIBUTE, 0)
-} ASN1_SEQUENCE_END_enc(X509_REQ_INFO, X509_REQ_INFO);
+} ASN1_SEQUENCE_END_enc(X509_REQ_INFO, X509_REQ_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_REQ_INFO)
 
@@ -106,6 +106,6 @@ ASN1_SEQUENCE_ref(X509_REQ, 0, CRYPTO_LOCK_X509_INFO) = {
 	ASN1_SIMPLE(X509_REQ, req_info, X509_REQ_INFO),
 	ASN1_SIMPLE(X509_REQ, sig_alg, X509_ALGOR),
 	ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING)
-} ASN1_SEQUENCE_END_ref(X509_REQ, X509_REQ);
+} ASN1_SEQUENCE_END_ref(X509_REQ, X509_REQ)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_REQ)
diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c
index e53d0a3057..42efa86c1c 100644
--- a/crypto/asn1/x_sig.c
+++ b/crypto/asn1/x_sig.c
@@ -64,6 +64,6 @@
 ASN1_SEQUENCE(X509_SIG) = {
 	ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),
 	ASN1_SIMPLE(X509_SIG, digest, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(X509_SIG);
+} ASN1_SEQUENCE_END(X509_SIG)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_SIG)
diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c
index 87dfb41b3e..2aece077c5 100644
--- a/crypto/asn1/x_spki.c
+++ b/crypto/asn1/x_spki.c
@@ -68,7 +68,7 @@
 ASN1_SEQUENCE(NETSCAPE_SPKAC) = {
 	ASN1_SIMPLE(NETSCAPE_SPKAC, pubkey, X509_PUBKEY),
 	ASN1_SIMPLE(NETSCAPE_SPKAC, challenge, ASN1_IA5STRING)
-} ASN1_SEQUENCE_END(NETSCAPE_SPKAC);
+} ASN1_SEQUENCE_END(NETSCAPE_SPKAC)
 
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
 
@@ -76,6 +76,6 @@ ASN1_SEQUENCE(NETSCAPE_SPKI) = {
 	ASN1_SIMPLE(NETSCAPE_SPKI, spkac, NETSCAPE_SPKAC),
 	ASN1_SIMPLE(NETSCAPE_SPKI, sig_algor, X509_ALGOR),
 	ASN1_SIMPLE(NETSCAPE_SPKI, signature, ASN1_BIT_STRING)
-} ASN1_SEQUENCE_END(NETSCAPE_SPKI);
+} ASN1_SEQUENCE_END(NETSCAPE_SPKI)
 
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_SPKI)
diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index d488dc237e..dc17c67758 100644
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -64,6 +64,6 @@
 ASN1_SEQUENCE(X509_VAL) = {
 	ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
 	ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
-} ASN1_SEQUENCE_END(X509_VAL);
+} ASN1_SEQUENCE_END(X509_VAL)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_VAL)
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 3209583f7c..dafb074ccc 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -77,7 +77,7 @@ ASN1_SEQUENCE(X509_CINF) = {
 	ASN1_IMP_OPT(X509_CINF, issuerUID, ASN1_BIT_STRING, 1),
 	ASN1_IMP_OPT(X509_CINF, subjectUID, ASN1_BIT_STRING, 2),
 	ASN1_EXP_SEQUENCE_OF_OPT(X509_CINF, extensions, X509_EXTENSION, 3)
-} ASN1_SEQUENCE_END(X509_CINF);
+} ASN1_SEQUENCE_END(X509_CINF)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_CINF)
 /* X509 top level structure needs a bit of customisation */
@@ -123,7 +123,7 @@ ASN1_SEQUENCE_ref(X509, x509_cb, CRYPTO_LOCK_X509) = {
 	ASN1_SIMPLE(X509, cert_info, X509_CINF),
 	ASN1_SIMPLE(X509, sig_alg, X509_ALGOR),
 	ASN1_SIMPLE(X509, signature, ASN1_BIT_STRING)
-} ASN1_SEQUENCE_END_ref(X509, X509);
+} ASN1_SEQUENCE_END_ref(X509, X509)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509)
 
diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
index 67d7fff642..f244768b7e 100644
--- a/crypto/asn1/x_x509a.c
+++ b/crypto/asn1/x_x509a.c
@@ -77,7 +77,7 @@ ASN1_SEQUENCE(X509_CERT_AUX) = {
 	ASN1_OPT(X509_CERT_AUX, alias, ASN1_UTF8STRING),
 	ASN1_OPT(X509_CERT_AUX, keyid, ASN1_OCTET_STRING),
 	ASN1_IMP_SEQUENCE_OF_OPT(X509_CERT_AUX, other, X509_ALGOR, 1)
-} ASN1_SEQUENCE_END(X509_CERT_AUX);
+} ASN1_SEQUENCE_END(X509_CERT_AUX)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_CERT_AUX)
 
diff --git a/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c
index 1f26be7ae7..769b5b68c5 100644
--- a/crypto/dh/dh_asn1.c
+++ b/crypto/dh/dh_asn1.c
@@ -82,6 +82,6 @@ ASN1_SEQUENCE_cb(DHparams, dh_cb) = {
 	ASN1_SIMPLE(DH, p, BIGNUM),
 	ASN1_SIMPLE(DH, g, BIGNUM),
 	ASN1_OPT(DH, length, ZLONG),
-} ASN1_SEQUENCE_END_cb(DH, DHparams);
+} ASN1_SEQUENCE_END_cb(DH, DHparams)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams)
diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index fba2f73023..23fce555aa 100644
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c
@@ -81,7 +81,7 @@ static int sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
 ASN1_SEQUENCE_cb(DSA_SIG, sig_cb) = {
 	ASN1_SIMPLE(DSA_SIG, r, CBIGNUM),
 	ASN1_SIMPLE(DSA_SIG, s, CBIGNUM)
-} ASN1_SEQUENCE_END_cb(DSA_SIG, DSA_SIG);
+} ASN1_SEQUENCE_END_cb(DSA_SIG, DSA_SIG)
 
 IMPLEMENT_ASN1_FUNCTIONS_const(DSA_SIG)
 
@@ -107,7 +107,7 @@ ASN1_SEQUENCE_cb(DSAPrivateKey, dsa_cb) = {
 	ASN1_SIMPLE(DSA, g, BIGNUM),
 	ASN1_SIMPLE(DSA, pub_key, BIGNUM),
 	ASN1_SIMPLE(DSA, priv_key, BIGNUM)
-} ASN1_SEQUENCE_END_cb(DSA, DSAPrivateKey);
+} ASN1_SEQUENCE_END_cb(DSA, DSAPrivateKey)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPrivateKey, DSAPrivateKey)
 
@@ -115,7 +115,7 @@ ASN1_SEQUENCE_cb(DSAparams, dsa_cb) = {
 	ASN1_SIMPLE(DSA, p, BIGNUM),
 	ASN1_SIMPLE(DSA, q, BIGNUM),
 	ASN1_SIMPLE(DSA, g, BIGNUM),
-} ASN1_SEQUENCE_END_cb(DSA, DSAparams);
+} ASN1_SEQUENCE_END_cb(DSA, DSAparams)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAparams, DSAparams)
 
@@ -130,11 +130,11 @@ ASN1_SEQUENCE(dsa_pub_internal) = {
 	ASN1_SIMPLE(DSA, p, BIGNUM),
 	ASN1_SIMPLE(DSA, q, BIGNUM),
 	ASN1_SIMPLE(DSA, g, BIGNUM)
-} ASN1_SEQUENCE_END_name(DSA, dsa_pub_internal);
+} ASN1_SEQUENCE_END_name(DSA, dsa_pub_internal)
 
 ASN1_CHOICE_cb(DSAPublicKey, dsa_cb) = {
 	ASN1_SIMPLE(DSA, pub_key, BIGNUM),
 	ASN1_EX_COMBINE(0, 0, dsa_pub_internal)
-} ASN1_CHOICE_END_cb(DSA, DSAPublicKey, write_params);
+} ASN1_CHOICE_END_cb(DSA, DSAPublicKey, write_params)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPublicKey, DSAPublicKey)
diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
index 0616b0ebe5..8c148cda6a 100644
--- a/crypto/ocsp/ocsp_asn.c
+++ b/crypto/ocsp/ocsp_asn.c
@@ -63,7 +63,7 @@ ASN1_SEQUENCE(OCSP_SIGNATURE) = {
 	ASN1_SIMPLE(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
 	ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),
 	ASN1_EXP_SEQUENCE_OF(OCSP_SIGNATURE, certs, X509, 0)
-} ASN1_SEQUENCE_END(OCSP_SIGNATURE);
+} ASN1_SEQUENCE_END(OCSP_SIGNATURE)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SIGNATURE)
 
@@ -72,14 +72,14 @@ ASN1_SEQUENCE(OCSP_CERTID) = {
 	ASN1_SIMPLE(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),
 	ASN1_SIMPLE(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),
 	ASN1_SIMPLE(OCSP_CERTID, serialNumber, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(OCSP_CERTID);
+} ASN1_SEQUENCE_END(OCSP_CERTID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTID)
 
 ASN1_SEQUENCE(OCSP_ONEREQ) = {
 	ASN1_SIMPLE(OCSP_ONEREQ, reqCert, OCSP_CERTID),
 	ASN1_EXP_SEQUENCE_OF_OPT(OCSP_ONEREQ, singleRequestExtensions, X509_EXTENSION, 0)
-} ASN1_SEQUENCE_END(OCSP_ONEREQ);
+} ASN1_SEQUENCE_END(OCSP_ONEREQ)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_ONEREQ)
 
@@ -88,14 +88,14 @@ ASN1_SEQUENCE(OCSP_REQINFO) = {
 	ASN1_EXP_OPT(OCSP_REQINFO, requestorName, GENERAL_NAME, 1),
 	ASN1_SEQUENCE_OF(OCSP_REQINFO, requestList, OCSP_ONEREQ),
 	ASN1_EXP_SEQUENCE_OF_OPT(OCSP_REQINFO, requestExtensions, X509_EXTENSION, 2)
-} ASN1_SEQUENCE_END(OCSP_REQINFO);
+} ASN1_SEQUENCE_END(OCSP_REQINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQINFO)
 
 ASN1_SEQUENCE(OCSP_REQUEST) = {
 	ASN1_SIMPLE(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),
 	ASN1_EXP_OPT(OCSP_REQUEST, optionalSignature, OCSP_SIGNATURE, 0)
-} ASN1_SEQUENCE_END(OCSP_REQUEST);
+} ASN1_SEQUENCE_END(OCSP_REQUEST)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
 
@@ -104,28 +104,28 @@ IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
 ASN1_SEQUENCE(OCSP_RESPBYTES) = {
 	    ASN1_SIMPLE(OCSP_RESPBYTES, responseType, ASN1_OBJECT),
 	    ASN1_SIMPLE(OCSP_RESPBYTES, response, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(OCSP_RESPBYTES);
+} ASN1_SEQUENCE_END(OCSP_RESPBYTES)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPBYTES)
 
 ASN1_SEQUENCE(OCSP_RESPONSE) = {
 	ASN1_SIMPLE(OCSP_RESPONSE, responseStatus, ASN1_ENUMERATED),
 	ASN1_EXP_OPT(OCSP_RESPONSE, responseBytes, OCSP_RESPBYTES, 0)
-} ASN1_SEQUENCE_END(OCSP_RESPONSE);
+} ASN1_SEQUENCE_END(OCSP_RESPONSE)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPONSE)
 
 ASN1_CHOICE(OCSP_RESPID) = {
 	   ASN1_EXP(OCSP_RESPID, value.byName, X509_NAME, 1),
 	   ASN1_IMP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
-} ASN1_CHOICE_END(OCSP_RESPID);
+} ASN1_CHOICE_END(OCSP_RESPID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPID)
 
 ASN1_SEQUENCE(OCSP_REVOKEDINFO) = {
 	ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
   	ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)
-} ASN1_SEQUENCE_END(OCSP_REVOKEDINFO);
+} ASN1_SEQUENCE_END(OCSP_REVOKEDINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
 
@@ -133,7 +133,7 @@ ASN1_CHOICE(OCSP_CERTSTATUS) = {
 	ASN1_IMP(OCSP_CERTSTATUS, value.good, ASN1_NULL, 0),
 	ASN1_IMP(OCSP_CERTSTATUS, value.revoked, OCSP_REVOKEDINFO, 1),
 	ASN1_IMP(OCSP_CERTSTATUS, value.unknown, ASN1_NULL, 2)
-} ASN1_CHOICE_END(OCSP_CERTSTATUS);
+} ASN1_CHOICE_END(OCSP_CERTSTATUS)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
 
@@ -143,7 +143,7 @@ ASN1_SEQUENCE(OCSP_SINGLERESP) = {
 	   ASN1_SIMPLE(OCSP_SINGLERESP, thisUpdate, ASN1_GENERALIZEDTIME),
 	   ASN1_EXP_OPT(OCSP_SINGLERESP, nextUpdate, ASN1_GENERALIZEDTIME, 0),
 	   ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SINGLERESP, singleExtensions, X509_EXTENSION, 1)
-} ASN1_SEQUENCE_END(OCSP_SINGLERESP);
+} ASN1_SEQUENCE_END(OCSP_SINGLERESP)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SINGLERESP)
 
@@ -153,7 +153,7 @@ ASN1_SEQUENCE(OCSP_RESPDATA) = {
 	   ASN1_SIMPLE(OCSP_RESPDATA, producedAt, ASN1_GENERALIZEDTIME),
 	   ASN1_SEQUENCE_OF(OCSP_RESPDATA, responses, OCSP_SINGLERESP),
 	   ASN1_EXP_SEQUENCE_OF_OPT(OCSP_RESPDATA, responseExtensions, X509_EXTENSION, 1)
-} ASN1_SEQUENCE_END(OCSP_RESPDATA);
+} ASN1_SEQUENCE_END(OCSP_RESPDATA)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPDATA)
 
@@ -162,7 +162,7 @@ ASN1_SEQUENCE(OCSP_BASICRESP) = {
 	   ASN1_SIMPLE(OCSP_BASICRESP, signatureAlgorithm, X509_ALGOR),
 	   ASN1_SIMPLE(OCSP_BASICRESP, signature, ASN1_BIT_STRING),
 	   ASN1_EXP_SEQUENCE_OF_OPT(OCSP_BASICRESP, certs, X509, 0)
-} ASN1_SEQUENCE_END(OCSP_BASICRESP);
+} ASN1_SEQUENCE_END(OCSP_BASICRESP)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_BASICRESP)
 
@@ -170,13 +170,13 @@ ASN1_SEQUENCE(OCSP_CRLID) = {
 	   ASN1_EXP_OPT(OCSP_CRLID, crlUrl, ASN1_IA5STRING, 0),
 	   ASN1_EXP_OPT(OCSP_CRLID, crlNum, ASN1_INTEGER, 1),
 	   ASN1_EXP_OPT(OCSP_CRLID, crlTime, ASN1_GENERALIZEDTIME, 2)
-} ASN1_SEQUENCE_END(OCSP_CRLID);
+} ASN1_SEQUENCE_END(OCSP_CRLID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CRLID)
 
 ASN1_SEQUENCE(OCSP_SERVICELOC) = {
 	ASN1_SIMPLE(OCSP_SERVICELOC, issuer, X509_NAME),
 	ASN1_SEQUENCE_OF_OPT(OCSP_SERVICELOC, locator, ACCESS_DESCRIPTION)
-} ASN1_SEQUENCE_END(OCSP_SERVICELOC);
+} ASN1_SEQUENCE_END(OCSP_SERVICELOC)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SERVICELOC)
diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c
index 860a6bb921..c327bdba03 100644
--- a/crypto/pkcs12/p12_asn.c
+++ b/crypto/pkcs12/p12_asn.c
@@ -67,7 +67,7 @@ ASN1_SEQUENCE(PKCS12) = {
 	ASN1_SIMPLE(PKCS12, version, ASN1_INTEGER),
 	ASN1_SIMPLE(PKCS12, authsafes, PKCS7),
 	ASN1_OPT(PKCS12, mac, PKCS12_MAC_DATA)
-} ASN1_SEQUENCE_END(PKCS12);
+} ASN1_SEQUENCE_END(PKCS12)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS12)
 
@@ -75,7 +75,7 @@ ASN1_SEQUENCE(PKCS12_MAC_DATA) = {
 	ASN1_SIMPLE(PKCS12_MAC_DATA, dinfo, X509_SIG),
 	ASN1_SIMPLE(PKCS12_MAC_DATA, salt, ASN1_OCTET_STRING),
 	ASN1_OPT(PKCS12_MAC_DATA, iter, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(PKCS12_MAC_DATA);
+} ASN1_SEQUENCE_END(PKCS12_MAC_DATA)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
 
@@ -90,7 +90,7 @@ ASN1_ADB(PKCS12_BAGS) = {
 ASN1_SEQUENCE(PKCS12_BAGS) = {
 	ASN1_SIMPLE(PKCS12_BAGS, type, ASN1_OBJECT),
 	ASN1_ADB_OBJECT(PKCS12_BAGS),
-} ASN1_SEQUENCE_END(PKCS12_BAGS);
+} ASN1_SEQUENCE_END(PKCS12_BAGS)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS12_BAGS)
 
@@ -109,17 +109,17 @@ ASN1_SEQUENCE(PKCS12_SAFEBAG) = {
 	ASN1_SIMPLE(PKCS12_SAFEBAG, type, ASN1_OBJECT),
 	ASN1_ADB_OBJECT(PKCS12_SAFEBAG),
 	ASN1_SET_OF_OPT(PKCS12_SAFEBAG, attrib, X509_ATTRIBUTE)
-} ASN1_SEQUENCE_END(PKCS12_SAFEBAG);
+} ASN1_SEQUENCE_END(PKCS12_SAFEBAG)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
 
 /* SEQUENCE OF SafeBag */
 ASN1_ITEM_TEMPLATE(PKCS12_SAFEBAGS) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_SAFEBAGS, PKCS12_SAFEBAG)
-ASN1_ITEM_TEMPLATE_END(PKCS12_SAFEBAGS);
+ASN1_ITEM_TEMPLATE_END(PKCS12_SAFEBAGS)
 
 /* Authsafes: SEQUENCE OF PKCS7 */
 ASN1_ITEM_TEMPLATE(PKCS12_AUTHSAFES) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_AUTHSAFES, PKCS7)
-ASN1_ITEM_TEMPLATE_END(PKCS12_AUTHSAFES);
+ASN1_ITEM_TEMPLATE_END(PKCS12_AUTHSAFES)
 
diff --git a/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c
index 34561dfc51..613aa13a4f 100644
--- a/crypto/pkcs7/pk7_asn1.c
+++ b/crypto/pkcs7/pk7_asn1.c
@@ -79,7 +79,7 @@ ASN1_ADB(PKCS7) = {
 ASN1_SEQUENCE(PKCS7) = {
 	ASN1_SIMPLE(PKCS7, type, ASN1_OBJECT),
 	ASN1_ADB_OBJECT(PKCS7)
-}ASN1_SEQUENCE_END(PKCS7);
+}ASN1_SEQUENCE_END(PKCS7)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7)
 
@@ -90,7 +90,7 @@ ASN1_SEQUENCE(PKCS7_SIGNED) = {
 	ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNED, cert, X509, 0),
 	ASN1_IMP_SET_OF_OPT(PKCS7_SIGNED, crl, X509_CRL, 1),
 	ASN1_SET_OF(PKCS7_SIGNED, signer_info, PKCS7_SIGNER_INFO)
-} ASN1_SEQUENCE_END(PKCS7_SIGNED);
+} ASN1_SEQUENCE_END(PKCS7_SIGNED)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNED)
 
@@ -117,14 +117,14 @@ ASN1_SEQUENCE_cb(PKCS7_SIGNER_INFO, si_cb) = {
 	ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_enc_alg, X509_ALGOR),
 	ASN1_SIMPLE(PKCS7_SIGNER_INFO, enc_digest, ASN1_OCTET_STRING),
 	ASN1_IMP_SET_OF_OPT(PKCS7_SIGNER_INFO, unauth_attr, X509_ATTRIBUTE, 1)
-} ASN1_SEQUENCE_END_cb(PKCS7_SIGNER_INFO, PKCS7_SIGNER_INFO);
+} ASN1_SEQUENCE_END_cb(PKCS7_SIGNER_INFO, PKCS7_SIGNER_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
 
 ASN1_SEQUENCE(PKCS7_ISSUER_AND_SERIAL) = {
 	ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, issuer, X509_NAME),
 	ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, serial, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(PKCS7_ISSUER_AND_SERIAL);
+} ASN1_SEQUENCE_END(PKCS7_ISSUER_AND_SERIAL)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
 
@@ -132,7 +132,7 @@ ASN1_SEQUENCE(PKCS7_ENVELOPE) = {
 	ASN1_SIMPLE(PKCS7_ENVELOPE, version, ASN1_INTEGER),
 	ASN1_SET_OF(PKCS7_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
 	ASN1_SIMPLE(PKCS7_ENVELOPE, enc_data, PKCS7_ENC_CONTENT)
-} ASN1_SEQUENCE_END(PKCS7_ENVELOPE);
+} ASN1_SEQUENCE_END(PKCS7_ENVELOPE)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
 
@@ -151,7 +151,7 @@ ASN1_SEQUENCE_cb(PKCS7_RECIP_INFO, ri_cb) = {
 	ASN1_SIMPLE(PKCS7_RECIP_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
 	ASN1_SIMPLE(PKCS7_RECIP_INFO, key_enc_algor, X509_ALGOR),
 	ASN1_SIMPLE(PKCS7_RECIP_INFO, enc_key, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END_cb(PKCS7_RECIP_INFO, PKCS7_RECIP_INFO);
+} ASN1_SEQUENCE_END_cb(PKCS7_RECIP_INFO, PKCS7_RECIP_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
 
@@ -159,7 +159,7 @@ ASN1_SEQUENCE(PKCS7_ENC_CONTENT) = {
 	ASN1_SIMPLE(PKCS7_ENC_CONTENT, content_type, ASN1_OBJECT),
 	ASN1_SIMPLE(PKCS7_ENC_CONTENT, algorithm, X509_ALGOR),
 	ASN1_IMP_OPT(PKCS7_ENC_CONTENT, enc_data, ASN1_OCTET_STRING, 0)
-} ASN1_SEQUENCE_END(PKCS7_ENC_CONTENT);
+} ASN1_SEQUENCE_END(PKCS7_ENC_CONTENT)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
 
@@ -171,14 +171,14 @@ ASN1_SEQUENCE(PKCS7_SIGN_ENVELOPE) = {
 	ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, cert, X509, 0),
 	ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, crl, X509_CRL, 1),
 	ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, signer_info, PKCS7_SIGNER_INFO)
-} ASN1_SEQUENCE_END(PKCS7_SIGN_ENVELOPE);
+} ASN1_SEQUENCE_END(PKCS7_SIGN_ENVELOPE)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
 
 ASN1_SEQUENCE(PKCS7_ENCRYPT) = {
 	ASN1_SIMPLE(PKCS7_ENCRYPT, version, ASN1_INTEGER),
 	ASN1_SIMPLE(PKCS7_ENCRYPT, enc_data, PKCS7_ENC_CONTENT)
-} ASN1_SEQUENCE_END(PKCS7_ENCRYPT);
+} ASN1_SEQUENCE_END(PKCS7_ENCRYPT)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
 
@@ -187,7 +187,7 @@ ASN1_SEQUENCE(PKCS7_DIGEST) = {
 	ASN1_SIMPLE(PKCS7_DIGEST, md, X509_ALGOR),
 	ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
 	ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(PKCS7_DIGEST);
+} ASN1_SEQUENCE_END(PKCS7_DIGEST)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)
 
@@ -199,7 +199,7 @@ IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)
 
 ASN1_ITEM_TEMPLATE(PKCS7_ATTR_SIGN) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
-ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_SIGN);
+ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_SIGN)
 
 /* When verifying attributes we need to use the received order. So 
  * we use SEQUENCE OF and tag it to SET OF
@@ -208,4 +208,4 @@ ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_SIGN);
 ASN1_ITEM_TEMPLATE(PKCS7_ATTR_VERIFY) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
 				V_ASN1_SET, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
-ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_VERIFY);
+ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_VERIFY)
diff --git a/crypto/rsa/rsa_asn1.c b/crypto/rsa/rsa_asn1.c
index 0585b241e6..9501923822 100644
--- a/crypto/rsa/rsa_asn1.c
+++ b/crypto/rsa/rsa_asn1.c
@@ -98,13 +98,13 @@ ASN1_SEQUENCE_cb(RSAPrivateKey, rsa_cb) = {
 	ASN1_SIMPLE(RSA, dmp1, BIGNUM),
 	ASN1_SIMPLE(RSA, dmq1, BIGNUM),
 	ASN1_SIMPLE(RSA, iqmp, BIGNUM)
-} ASN1_SEQUENCE_END_cb(RSA, RSAPrivateKey);
+} ASN1_SEQUENCE_END_cb(RSA, RSAPrivateKey)
 
 
 ASN1_SEQUENCE_cb(RSAPublicKey, rsa_cb) = {
 	ASN1_SIMPLE(RSA, n, BIGNUM),
 	ASN1_SIMPLE(RSA, e, BIGNUM),
-} ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey);
+} ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPrivateKey, RSAPrivateKey)
 
diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c
index 0e11d0c9bc..8ec41ab9d6 100644
--- a/crypto/x509v3/v3_akey.c
+++ b/crypto/x509v3/v3_akey.c
@@ -82,7 +82,7 @@ ASN1_SEQUENCE(AUTHORITY_KEYID) = {
 	ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
 	ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
 	ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
-} ASN1_SEQUENCE_END(AUTHORITY_KEYID);
+} ASN1_SEQUENCE_END(AUTHORITY_KEYID)
 
 IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_KEYID)
 
diff --git a/crypto/x509v3/v3_bcons.c b/crypto/x509v3/v3_bcons.c
index 94c64b7c8b..cbb012715e 100644
--- a/crypto/x509v3/v3_bcons.c
+++ b/crypto/x509v3/v3_bcons.c
@@ -81,7 +81,7 @@ NULL
 ASN1_SEQUENCE(BASIC_CONSTRAINTS) = {
 	ASN1_OPT(BASIC_CONSTRAINTS, ca, ASN1_FBOOLEAN),
 	ASN1_OPT(BASIC_CONSTRAINTS, pathlen, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(BASIC_CONSTRAINTS);
+} ASN1_SEQUENCE_END(BASIC_CONSTRAINTS)
 
 IMPLEMENT_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
 
diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c
index b3428e7fb8..0d4ab1f680 100644
--- a/crypto/x509v3/v3_cpols.c
+++ b/crypto/x509v3/v3_cpols.c
@@ -87,14 +87,14 @@ NULL
 
 ASN1_ITEM_TEMPLATE(CERTIFICATEPOLICIES) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CERTIFICATEPOLICIES, POLICYINFO)
-ASN1_ITEM_TEMPLATE_END(CERTIFICATEPOLICIES);
+ASN1_ITEM_TEMPLATE_END(CERTIFICATEPOLICIES)
 
 IMPLEMENT_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
 
 ASN1_SEQUENCE(POLICYINFO) = {
 	ASN1_SIMPLE(POLICYINFO, policyid, ASN1_OBJECT),
 	ASN1_SEQUENCE_OF_OPT(POLICYINFO, qualifiers, POLICYQUALINFO)
-} ASN1_SEQUENCE_END(POLICYINFO);
+} ASN1_SEQUENCE_END(POLICYINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(POLICYINFO)
 
@@ -108,21 +108,21 @@ ASN1_ADB(POLICYQUALINFO) = {
 ASN1_SEQUENCE(POLICYQUALINFO) = {
 	ASN1_SIMPLE(POLICYQUALINFO, pqualid, ASN1_OBJECT),
 	ASN1_ADB_OBJECT(POLICYQUALINFO)
-} ASN1_SEQUENCE_END(POLICYQUALINFO);
+} ASN1_SEQUENCE_END(POLICYQUALINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(POLICYQUALINFO)
 
 ASN1_SEQUENCE(USERNOTICE) = {
 	ASN1_OPT(USERNOTICE, noticeref, NOTICEREF),
 	ASN1_OPT(USERNOTICE, exptext, DISPLAYTEXT)
-} ASN1_SEQUENCE_END(USERNOTICE);
+} ASN1_SEQUENCE_END(USERNOTICE)
 
 IMPLEMENT_ASN1_FUNCTIONS(USERNOTICE)
 
 ASN1_SEQUENCE(NOTICEREF) = {
 	ASN1_SIMPLE(NOTICEREF, organization, DISPLAYTEXT),
 	ASN1_SEQUENCE_OF(NOTICEREF, noticenos, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(NOTICEREF);
+} ASN1_SEQUENCE_END(NOTICEREF)
 
 IMPLEMENT_ASN1_FUNCTIONS(NOTICEREF)
 
diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c
index 794cdca27e..894a8b94d8 100644
--- a/crypto/x509v3/v3_crld.c
+++ b/crypto/x509v3/v3_crld.c
@@ -143,7 +143,7 @@ IMPLEMENT_ASN1_SET_OF(DIST_POINT)
 ASN1_CHOICE(DIST_POINT_NAME) = {
 	ASN1_IMP_SEQUENCE_OF(DIST_POINT_NAME, name.fullname, GENERAL_NAME, 0),
 	ASN1_IMP_SET_OF(DIST_POINT_NAME, name.relativename, X509_NAME_ENTRY, 1)
-} ASN1_CHOICE_END(DIST_POINT_NAME);
+} ASN1_CHOICE_END(DIST_POINT_NAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(DIST_POINT_NAME)
 
@@ -151,12 +151,12 @@ ASN1_SEQUENCE(DIST_POINT) = {
 	ASN1_EXP_OPT(DIST_POINT, distpoint, DIST_POINT_NAME, 0),
 	ASN1_IMP_OPT(DIST_POINT, reasons, ASN1_BIT_STRING, 1),
 	ASN1_IMP_SEQUENCE_OF_OPT(DIST_POINT, CRLissuer, GENERAL_NAME, 2)
-} ASN1_SEQUENCE_END(DIST_POINT);
+} ASN1_SEQUENCE_END(DIST_POINT)
 
 IMPLEMENT_ASN1_FUNCTIONS(DIST_POINT)
 
 ASN1_ITEM_TEMPLATE(CRL_DIST_POINTS) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, DIST_POINT, DIST_POINT)
-ASN1_ITEM_TEMPLATE_END(CRL_DIST_POINTS);
+ASN1_ITEM_TEMPLATE_END(CRL_DIST_POINTS)
 
 IMPLEMENT_ASN1_FUNCTIONS(CRL_DIST_POINTS)
diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509v3/v3_extku.c
index 8bcc94fd0d..b1cfaba1aa 100644
--- a/crypto/x509v3/v3_extku.c
+++ b/crypto/x509v3/v3_extku.c
@@ -93,7 +93,7 @@ X509V3_EXT_METHOD v3_ocsp_accresp = {
 
 ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
-ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE);
+ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
 
 IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
 
diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
index dc5ceb09e1..650b510980 100644
--- a/crypto/x509v3/v3_genn.c
+++ b/crypto/x509v3/v3_genn.c
@@ -67,14 +67,14 @@ ASN1_SEQUENCE(OTHERNAME) = {
 	ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
 	/* Maybe have a true ANY DEFINED BY later */
 	ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0)
-} ASN1_SEQUENCE_END(OTHERNAME);
+} ASN1_SEQUENCE_END(OTHERNAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(OTHERNAME)
 
 ASN1_SEQUENCE(EDIPARTYNAME) = {
 	ASN1_IMP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
 	ASN1_IMP_OPT(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
-} ASN1_SEQUENCE_END(EDIPARTYNAME);
+} ASN1_SEQUENCE_END(EDIPARTYNAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME)
 
@@ -90,12 +90,12 @@ ASN1_CHOICE(GENERAL_NAME) = {
 	ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING, GEN_URI),
 	ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
 	ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID)
-} ASN1_CHOICE_END(GENERAL_NAME);
+} ASN1_CHOICE_END(GENERAL_NAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAME)
 
 ASN1_ITEM_TEMPLATE(GENERAL_NAMES) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
-ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES);
+ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
diff --git a/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c
index 0bbd582c43..b7e793ada1 100644
--- a/crypto/x509v3/v3_info.c
+++ b/crypto/x509v3/v3_info.c
@@ -81,13 +81,13 @@ NULL};
 ASN1_SEQUENCE(ACCESS_DESCRIPTION) = {
 	ASN1_SIMPLE(ACCESS_DESCRIPTION, method, ASN1_OBJECT),
 	ASN1_SIMPLE(ACCESS_DESCRIPTION, location, GENERAL_NAME)
-} ASN1_SEQUENCE_END(ACCESS_DESCRIPTION);
+} ASN1_SEQUENCE_END(ACCESS_DESCRIPTION)
 
 IMPLEMENT_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
 
 ASN1_ITEM_TEMPLATE(AUTHORITY_INFO_ACCESS) = 
 	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, ACCESS_DESCRIPTION)
-ASN1_ITEM_TEMPLATE_END(AUTHORITY_INFO_ACCESS);
+ASN1_ITEM_TEMPLATE_END(AUTHORITY_INFO_ACCESS)
 
 IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
 
diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c
index b48089396d..49a2e4697a 100644
--- a/crypto/x509v3/v3_pku.c
+++ b/crypto/x509v3/v3_pku.c
@@ -77,7 +77,7 @@ NULL
 ASN1_SEQUENCE(PKEY_USAGE_PERIOD) = {
 	ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notBefore, ASN1_GENERALIZEDTIME, 0),
 	ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notAfter, ASN1_GENERALIZEDTIME, 1)
-} ASN1_SEQUENCE_END(PKEY_USAGE_PERIOD);
+} ASN1_SEQUENCE_END(PKEY_USAGE_PERIOD)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
 
diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c
index 24e14026a9..d3f4ba3a72 100644
--- a/crypto/x509v3/v3_sxnet.c
+++ b/crypto/x509v3/v3_sxnet.c
@@ -90,14 +90,14 @@ NULL
 ASN1_SEQUENCE(SXNETID) = {
 	ASN1_SIMPLE(SXNETID, zone, ASN1_INTEGER),
 	ASN1_SIMPLE(SXNETID, user, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(SXNETID);
+} ASN1_SEQUENCE_END(SXNETID)
 
 IMPLEMENT_ASN1_FUNCTIONS(SXNETID)
 
 ASN1_SEQUENCE(SXNET) = {
 	ASN1_SIMPLE(SXNET, version, ASN1_INTEGER),
 	ASN1_SEQUENCE_OF(SXNET, ids, SXNETID)
-} ASN1_SEQUENCE_END(SXNET);
+} ASN1_SEQUENCE_END(SXNET)
 
 IMPLEMENT_ASN1_FUNCTIONS(SXNET)