libressl *_namespace.h: adjust *_ALIAS() to require a semicolon

LCRYPTO_ALIAS() and LSSL_ALIAS() contained a trailing semicolon. This does not conform to style(9), breaks editors and ctags and (most importantly) my workflow. Fix this by neutering them with asm("") so that -Wpedantic doesn't complain. There's precedent in libc's namespace.h fix suggested by & ok jsing
author: tb <> 2023-02-16 08:38:17 +0000
committer: tb <> 2023-02-16 08:38:17 +0000
commit: b1fbdd21532891fac5b0f128e57331894bd69d84 (patch)
tree: 689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/x509/x509_cpols.c
parent: ee0f647faa09f91cb79b628dcb818adaa381af90 (diff)
download: openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.gz
openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.bz2
openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.zip
1 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/libcrypto/x509/x509_cpols.c b/src/lib/libcrypto/x509/x509_cpols.c
index 12e4a55c47..3f106c691d 100644
--- a/src/lib/libcrypto/x509/x509_cpols.c
+++ b/src/lib/libcrypto/x509/x509_cpols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_cpols.c,v 1.6 2022/11/26 16:08:54 tb Exp $ */
+/* $OpenBSD: x509_cpols.c,v 1.7 2023/02/16 08:38:17 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
 * project 1999.
 */
@@ -125,28 +125,28 @@ d2i_CERTIFICATEPOLICIES(CERTIFICATEPOLICIES **a, const unsigned char **in, long
        return (CERTIFICATEPOLICIES *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
            &CERTIFICATEPOLICIES_it);
 }
-LCRYPTO_ALIAS(d2i_CERTIFICATEPOLICIES)
+LCRYPTO_ALIAS(d2i_CERTIFICATEPOLICIES);
 int
 i2d_CERTIFICATEPOLICIES(CERTIFICATEPOLICIES *a, unsigned char **out)
 {
        return ASN1_item_i2d((ASN1_VALUE *)a, out, &CERTIFICATEPOLICIES_it);
 }
-LCRYPTO_ALIAS(i2d_CERTIFICATEPOLICIES)
+LCRYPTO_ALIAS(i2d_CERTIFICATEPOLICIES);
 CERTIFICATEPOLICIES *
 CERTIFICATEPOLICIES_new(void)
 {
        return (CERTIFICATEPOLICIES *)ASN1_item_new(&CERTIFICATEPOLICIES_it);
 }
-LCRYPTO_ALIAS(CERTIFICATEPOLICIES_new)
+LCRYPTO_ALIAS(CERTIFICATEPOLICIES_new);
 void
 CERTIFICATEPOLICIES_free(CERTIFICATEPOLICIES *a)
 {
        ASN1_item_free((ASN1_VALUE *)a, &CERTIFICATEPOLICIES_it);
 }
-LCRYPTO_ALIAS(CERTIFICATEPOLICIES_free)
+LCRYPTO_ALIAS(CERTIFICATEPOLICIES_free);
 static const ASN1_TEMPLATE POLICYINFO_seq_tt[] = {
        {
@@ -182,28 +182,28 @@ d2i_POLICYINFO(POLICYINFO **a, const unsigned char **in, long len)
        return (POLICYINFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
            &POLICYINFO_it);
 }
-LCRYPTO_ALIAS(d2i_POLICYINFO)
+LCRYPTO_ALIAS(d2i_POLICYINFO);
 int
 i2d_POLICYINFO(POLICYINFO *a, unsigned char **out)
 {
        return ASN1_item_i2d((ASN1_VALUE *)a, out, &POLICYINFO_it);
 }
-LCRYPTO_ALIAS(i2d_POLICYINFO)
+LCRYPTO_ALIAS(i2d_POLICYINFO);
 POLICYINFO *
 POLICYINFO_new(void)
 {
        return (POLICYINFO *)ASN1_item_new(&POLICYINFO_it);
 }
-LCRYPTO_ALIAS(POLICYINFO_new)
+LCRYPTO_ALIAS(POLICYINFO_new);
 void
 POLICYINFO_free(POLICYINFO *a)
 {
        ASN1_item_free((ASN1_VALUE *)a, &POLICYINFO_it);
 }
-LCRYPTO_ALIAS(POLICYINFO_free)
+LCRYPTO_ALIAS(POLICYINFO_free);
 static const ASN1_TEMPLATE policydefault_tt = {
        .flags = 0,
@@ -281,28 +281,28 @@ d2i_POLICYQUALINFO(POLICYQUALINFO **a, const unsigned char **in, long len)
        return (POLICYQUALINFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
            &POLICYQUALINFO_it);
 }
-LCRYPTO_ALIAS(d2i_POLICYQUALINFO)
+LCRYPTO_ALIAS(d2i_POLICYQUALINFO);
 int
 i2d_POLICYQUALINFO(POLICYQUALINFO *a, unsigned char **out)
 {
        return ASN1_item_i2d((ASN1_VALUE *)a, out, &POLICYQUALINFO_it);
 }
-LCRYPTO_ALIAS(i2d_POLICYQUALINFO)
+LCRYPTO_ALIAS(i2d_POLICYQUALINFO);
 POLICYQUALINFO *
 POLICYQUALINFO_new(void)
 {
        return (POLICYQUALINFO *)ASN1_item_new(&POLICYQUALINFO_it);
 }
-LCRYPTO_ALIAS(POLICYQUALINFO_new)
+LCRYPTO_ALIAS(POLICYQUALINFO_new);
 void
 POLICYQUALINFO_free(POLICYQUALINFO *a)
 {
        ASN1_item_free((ASN1_VALUE *)a, &POLICYQUALINFO_it);
 }
-LCRYPTO_ALIAS(POLICYQUALINFO_free)
+LCRYPTO_ALIAS(POLICYQUALINFO_free);
 static const ASN1_TEMPLATE USERNOTICE_seq_tt[] = {
        {
@@ -338,28 +338,28 @@ d2i_USERNOTICE(USERNOTICE **a, const unsigned char **in, long len)
        return (USERNOTICE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
            &USERNOTICE_it);
 }
-LCRYPTO_ALIAS(d2i_USERNOTICE)
+LCRYPTO_ALIAS(d2i_USERNOTICE);
 int
 i2d_USERNOTICE(USERNOTICE *a, unsigned char **out)
 {
        return ASN1_item_i2d((ASN1_VALUE *)a, out, &USERNOTICE_it);
 }
-LCRYPTO_ALIAS(i2d_USERNOTICE)
+LCRYPTO_ALIAS(i2d_USERNOTICE);
 USERNOTICE *
 USERNOTICE_new(void)
 {
        return (USERNOTICE *)ASN1_item_new(&USERNOTICE_it);
 }
-LCRYPTO_ALIAS(USERNOTICE_new)
+LCRYPTO_ALIAS(USERNOTICE_new);
 void
 USERNOTICE_free(USERNOTICE *a)
 {
        ASN1_item_free((ASN1_VALUE *)a, &USERNOTICE_it);
 }
-LCRYPTO_ALIAS(USERNOTICE_free)
+LCRYPTO_ALIAS(USERNOTICE_free);
 static const ASN1_TEMPLATE NOTICEREF_seq_tt[] = {
        {
@@ -395,28 +395,28 @@ d2i_NOTICEREF(NOTICEREF **a, const unsigned char **in, long len)
        return (NOTICEREF *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
            &NOTICEREF_it);
 }
-LCRYPTO_ALIAS(d2i_NOTICEREF)
+LCRYPTO_ALIAS(d2i_NOTICEREF);
 int
 i2d_NOTICEREF(NOTICEREF *a, unsigned char **out)
 {
        return ASN1_item_i2d((ASN1_VALUE *)a, out, &NOTICEREF_it);
 }
-LCRYPTO_ALIAS(i2d_NOTICEREF)
+LCRYPTO_ALIAS(i2d_NOTICEREF);
 NOTICEREF *
 NOTICEREF_new(void)
 {
        return (NOTICEREF *)ASN1_item_new(&NOTICEREF_it);
 }
-LCRYPTO_ALIAS(NOTICEREF_new)
+LCRYPTO_ALIAS(NOTICEREF_new);
 void
 NOTICEREF_free(NOTICEREF *a)
 {
        ASN1_item_free((ASN1_VALUE *)a, &NOTICEREF_it);
 }
-LCRYPTO_ALIAS(NOTICEREF_free)
+LCRYPTO_ALIAS(NOTICEREF_free);
 static STACK_OF(POLICYINFO) *
 r2i_certpol(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *value)
@@ -782,4 +782,4 @@ X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent)
        else
                BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");
 }
-LCRYPTO_ALIAS(X509_POLICY_NODE_print)
+LCRYPTO_ALIAS(X509_POLICY_NODE_print);
author	tb <>	2023-02-16 08:38:17 +0000
committer	tb <>	2023-02-16 08:38:17 +0000
commit	b1fbdd21532891fac5b0f128e57331894bd69d84 (patch)
tree	689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/x509/x509_cpols.c
parent	ee0f647faa09f91cb79b628dcb818adaa381af90 (diff)
download	openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.gz openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.bz2 openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.zip

diff --git a/src/lib/libcrypto/x509/x509_cpols.c b/src/lib/libcrypto/x509/x509_cpols.c index 12e4a55c47..3f106c691d 100644 --- a/src/lib/libcrypto/x509/x509_cpols.c +++ b/src/lib/libcrypto/x509/x509_cpols.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: x509_cpols.c,v 1.6 2022/11/26 16:08:54 tb Exp $ */	1	/* $OpenBSD: x509_cpols.c,v 1.7 2023/02/16 08:38:17 tb Exp $ */
2	/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL	2	/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3	* project 1999.	3	* project 1999.
4	*/	4	*/
@@ -125,28 +125,28 @@ d2i_CERTIFICATEPOLICIES(CERTIFICATEPOLICIES a, const unsigned char in, long
125	return (CERTIFICATEPOLICIES )ASN1_item_d2i((ASN1_VALUE *)a, in, len,	125	return (CERTIFICATEPOLICIES )ASN1_item_d2i((ASN1_VALUE *)a, in, len,
126	&CERTIFICATEPOLICIES_it);	126	&CERTIFICATEPOLICIES_it);
127	}	127	}
128	LCRYPTO_ALIAS(d2i_CERTIFICATEPOLICIES)	128	LCRYPTO_ALIAS(d2i_CERTIFICATEPOLICIES);
129		129
130	int	130	int
131	i2d_CERTIFICATEPOLICIES(CERTIFICATEPOLICIES a, unsigned char *out)	131	i2d_CERTIFICATEPOLICIES(CERTIFICATEPOLICIES a, unsigned char *out)
132	{	132	{
133	return ASN1_item_i2d((ASN1_VALUE *)a, out, &CERTIFICATEPOLICIES_it);	133	return ASN1_item_i2d((ASN1_VALUE *)a, out, &CERTIFICATEPOLICIES_it);
134	}	134	}
135	LCRYPTO_ALIAS(i2d_CERTIFICATEPOLICIES)	135	LCRYPTO_ALIAS(i2d_CERTIFICATEPOLICIES);
136		136
137	CERTIFICATEPOLICIES *	137	CERTIFICATEPOLICIES *
138	CERTIFICATEPOLICIES_new(void)	138	CERTIFICATEPOLICIES_new(void)
139	{	139	{
140	return (CERTIFICATEPOLICIES *)ASN1_item_new(&CERTIFICATEPOLICIES_it);	140	return (CERTIFICATEPOLICIES *)ASN1_item_new(&CERTIFICATEPOLICIES_it);
141	}	141	}
142	LCRYPTO_ALIAS(CERTIFICATEPOLICIES_new)	142	LCRYPTO_ALIAS(CERTIFICATEPOLICIES_new);
143		143
144	void	144	void
145	CERTIFICATEPOLICIES_free(CERTIFICATEPOLICIES *a)	145	CERTIFICATEPOLICIES_free(CERTIFICATEPOLICIES *a)
146	{	146	{
147	ASN1_item_free((ASN1_VALUE *)a, &CERTIFICATEPOLICIES_it);	147	ASN1_item_free((ASN1_VALUE *)a, &CERTIFICATEPOLICIES_it);
148	}	148	}
149	LCRYPTO_ALIAS(CERTIFICATEPOLICIES_free)	149	LCRYPTO_ALIAS(CERTIFICATEPOLICIES_free);
150		150
151	static const ASN1_TEMPLATE POLICYINFO_seq_tt[] = {	151	static const ASN1_TEMPLATE POLICYINFO_seq_tt[] = {
152	{	152	{
@@ -182,28 +182,28 @@ d2i_POLICYINFO(POLICYINFO a, const unsigned char in, long len)
182	return (POLICYINFO )ASN1_item_d2i((ASN1_VALUE *)a, in, len,	182	return (POLICYINFO )ASN1_item_d2i((ASN1_VALUE *)a, in, len,
183	&POLICYINFO_it);	183	&POLICYINFO_it);
184	}	184	}
185	LCRYPTO_ALIAS(d2i_POLICYINFO)	185	LCRYPTO_ALIAS(d2i_POLICYINFO);
186		186
187	int	187	int
188	i2d_POLICYINFO(POLICYINFO a, unsigned char *out)	188	i2d_POLICYINFO(POLICYINFO a, unsigned char *out)
189	{	189	{
190	return ASN1_item_i2d((ASN1_VALUE *)a, out, &POLICYINFO_it);	190	return ASN1_item_i2d((ASN1_VALUE *)a, out, &POLICYINFO_it);
191	}	191	}
192	LCRYPTO_ALIAS(i2d_POLICYINFO)	192	LCRYPTO_ALIAS(i2d_POLICYINFO);
193		193
194	POLICYINFO *	194	POLICYINFO *
195	POLICYINFO_new(void)	195	POLICYINFO_new(void)
196	{	196	{
197	return (POLICYINFO *)ASN1_item_new(&POLICYINFO_it);	197	return (POLICYINFO *)ASN1_item_new(&POLICYINFO_it);
198	}	198	}
199	LCRYPTO_ALIAS(POLICYINFO_new)	199	LCRYPTO_ALIAS(POLICYINFO_new);
200		200
201	void	201	void
202	POLICYINFO_free(POLICYINFO *a)	202	POLICYINFO_free(POLICYINFO *a)
203	{	203	{
204	ASN1_item_free((ASN1_VALUE *)a, &POLICYINFO_it);	204	ASN1_item_free((ASN1_VALUE *)a, &POLICYINFO_it);
205	}	205	}
206	LCRYPTO_ALIAS(POLICYINFO_free)	206	LCRYPTO_ALIAS(POLICYINFO_free);
207		207
208	static const ASN1_TEMPLATE policydefault_tt = {	208	static const ASN1_TEMPLATE policydefault_tt = {
209	.flags = 0,	209	.flags = 0,
@@ -281,28 +281,28 @@ d2i_POLICYQUALINFO(POLICYQUALINFO a, const unsigned char in, long len)
281	return (POLICYQUALINFO )ASN1_item_d2i((ASN1_VALUE *)a, in, len,	281	return (POLICYQUALINFO )ASN1_item_d2i((ASN1_VALUE *)a, in, len,
282	&POLICYQUALINFO_it);	282	&POLICYQUALINFO_it);
283	}	283	}
284	LCRYPTO_ALIAS(d2i_POLICYQUALINFO)	284	LCRYPTO_ALIAS(d2i_POLICYQUALINFO);
285		285
286	int	286	int
287	i2d_POLICYQUALINFO(POLICYQUALINFO a, unsigned char *out)	287	i2d_POLICYQUALINFO(POLICYQUALINFO a, unsigned char *out)
288	{	288	{
289	return ASN1_item_i2d((ASN1_VALUE *)a, out, &POLICYQUALINFO_it);	289	return ASN1_item_i2d((ASN1_VALUE *)a, out, &POLICYQUALINFO_it);
290	}	290	}
291	LCRYPTO_ALIAS(i2d_POLICYQUALINFO)	291	LCRYPTO_ALIAS(i2d_POLICYQUALINFO);
292		292
293	POLICYQUALINFO *	293	POLICYQUALINFO *
294	POLICYQUALINFO_new(void)	294	POLICYQUALINFO_new(void)
295	{	295	{
296	return (POLICYQUALINFO *)ASN1_item_new(&POLICYQUALINFO_it);	296	return (POLICYQUALINFO *)ASN1_item_new(&POLICYQUALINFO_it);
297	}	297	}
298	LCRYPTO_ALIAS(POLICYQUALINFO_new)	298	LCRYPTO_ALIAS(POLICYQUALINFO_new);
299		299
300	void	300	void
301	POLICYQUALINFO_free(POLICYQUALINFO *a)	301	POLICYQUALINFO_free(POLICYQUALINFO *a)
302	{	302	{
303	ASN1_item_free((ASN1_VALUE *)a, &POLICYQUALINFO_it);	303	ASN1_item_free((ASN1_VALUE *)a, &POLICYQUALINFO_it);
304	}	304	}
305	LCRYPTO_ALIAS(POLICYQUALINFO_free)	305	LCRYPTO_ALIAS(POLICYQUALINFO_free);
306		306
307	static const ASN1_TEMPLATE USERNOTICE_seq_tt[] = {	307	static const ASN1_TEMPLATE USERNOTICE_seq_tt[] = {
308	{	308	{
@@ -338,28 +338,28 @@ d2i_USERNOTICE(USERNOTICE a, const unsigned char in, long len)
338	return (USERNOTICE )ASN1_item_d2i((ASN1_VALUE *)a, in, len,	338	return (USERNOTICE )ASN1_item_d2i((ASN1_VALUE *)a, in, len,
339	&USERNOTICE_it);	339	&USERNOTICE_it);
340	}	340	}
341	LCRYPTO_ALIAS(d2i_USERNOTICE)	341	LCRYPTO_ALIAS(d2i_USERNOTICE);
342		342
343	int	343	int
344	i2d_USERNOTICE(USERNOTICE a, unsigned char *out)	344	i2d_USERNOTICE(USERNOTICE a, unsigned char *out)
345	{	345	{
346	return ASN1_item_i2d((ASN1_VALUE *)a, out, &USERNOTICE_it);	346	return ASN1_item_i2d((ASN1_VALUE *)a, out, &USERNOTICE_it);
347	}	347	}
348	LCRYPTO_ALIAS(i2d_USERNOTICE)	348	LCRYPTO_ALIAS(i2d_USERNOTICE);
349		349
350	USERNOTICE *	350	USERNOTICE *
351	USERNOTICE_new(void)	351	USERNOTICE_new(void)
352	{	352	{
353	return (USERNOTICE *)ASN1_item_new(&USERNOTICE_it);	353	return (USERNOTICE *)ASN1_item_new(&USERNOTICE_it);
354	}	354	}
355	LCRYPTO_ALIAS(USERNOTICE_new)	355	LCRYPTO_ALIAS(USERNOTICE_new);
356		356
357	void	357	void
358	USERNOTICE_free(USERNOTICE *a)	358	USERNOTICE_free(USERNOTICE *a)
359	{	359	{
360	ASN1_item_free((ASN1_VALUE *)a, &USERNOTICE_it);	360	ASN1_item_free((ASN1_VALUE *)a, &USERNOTICE_it);
361	}	361	}
362	LCRYPTO_ALIAS(USERNOTICE_free)	362	LCRYPTO_ALIAS(USERNOTICE_free);
363		363
364	static const ASN1_TEMPLATE NOTICEREF_seq_tt[] = {	364	static const ASN1_TEMPLATE NOTICEREF_seq_tt[] = {
365	{	365	{
@@ -395,28 +395,28 @@ d2i_NOTICEREF(NOTICEREF a, const unsigned char in, long len)
395	return (NOTICEREF )ASN1_item_d2i((ASN1_VALUE *)a, in, len,	395	return (NOTICEREF )ASN1_item_d2i((ASN1_VALUE *)a, in, len,
396	&NOTICEREF_it);	396	&NOTICEREF_it);
397	}	397	}
398	LCRYPTO_ALIAS(d2i_NOTICEREF)	398	LCRYPTO_ALIAS(d2i_NOTICEREF);
399		399
400	int	400	int
401	i2d_NOTICEREF(NOTICEREF a, unsigned char *out)	401	i2d_NOTICEREF(NOTICEREF a, unsigned char *out)
402	{	402	{
403	return ASN1_item_i2d((ASN1_VALUE *)a, out, &NOTICEREF_it);	403	return ASN1_item_i2d((ASN1_VALUE *)a, out, &NOTICEREF_it);
404	}	404	}
405	LCRYPTO_ALIAS(i2d_NOTICEREF)	405	LCRYPTO_ALIAS(i2d_NOTICEREF);
406		406
407	NOTICEREF *	407	NOTICEREF *
408	NOTICEREF_new(void)	408	NOTICEREF_new(void)
409	{	409	{
410	return (NOTICEREF *)ASN1_item_new(&NOTICEREF_it);	410	return (NOTICEREF *)ASN1_item_new(&NOTICEREF_it);
411	}	411	}
412	LCRYPTO_ALIAS(NOTICEREF_new)	412	LCRYPTO_ALIAS(NOTICEREF_new);
413		413
414	void	414	void
415	NOTICEREF_free(NOTICEREF *a)	415	NOTICEREF_free(NOTICEREF *a)
416	{	416	{
417	ASN1_item_free((ASN1_VALUE *)a, &NOTICEREF_it);	417	ASN1_item_free((ASN1_VALUE *)a, &NOTICEREF_it);
418	}	418	}
419	LCRYPTO_ALIAS(NOTICEREF_free)	419	LCRYPTO_ALIAS(NOTICEREF_free);
420		420
421	static STACK_OF(POLICYINFO) *	421	static STACK_OF(POLICYINFO) *
422	r2i_certpol(X509V3_EXT_METHOD method, X509V3_CTX ctx, char *value)	422	r2i_certpol(X509V3_EXT_METHOD method, X509V3_CTX ctx, char *value)
@@ -782,4 +782,4 @@ X509_POLICY_NODE_print(BIO out, X509_POLICY_NODE node, int indent)
782	else	782	else
783	BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");	783	BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");
784	}	784	}
785	LCRYPTO_ALIAS(X509_POLICY_NODE_print)	785	LCRYPTO_ALIAS(X509_POLICY_NODE_print);