summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_sxnet.c
diff options
context:
space:
mode:
authortb <>2023-02-16 08:38:17 +0000
committertb <>2023-02-16 08:38:17 +0000
commitb1fbdd21532891fac5b0f128e57331894bd69d84 (patch)
tree689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/x509/x509_sxnet.c
parentee0f647faa09f91cb79b628dcb818adaa381af90 (diff)
downloadopenbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.gz
openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.bz2
openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.zip
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
Diffstat (limited to 'src/lib/libcrypto/x509/x509_sxnet.c')
-rw-r--r--src/lib/libcrypto/x509/x509_sxnet.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/x509/x509_sxnet.c b/src/lib/libcrypto/x509/x509_sxnet.c
index 9c66a6b769..77c792d227 100644
--- a/src/lib/libcrypto/x509/x509_sxnet.c
+++ b/src/lib/libcrypto/x509/x509_sxnet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_sxnet.c,v 1.2 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_sxnet.c,v 1.3 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 */
@@ -131,28 +131,28 @@ d2i_SXNETID(SXNETID **a, const unsigned char **in, long len)
131 return (SXNETID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 131 return (SXNETID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
132 &SXNETID_it); 132 &SXNETID_it);
133} 133}
134LCRYPTO_ALIAS(d2i_SXNETID) 134LCRYPTO_ALIAS(d2i_SXNETID);
135 135
136int 136int
137i2d_SXNETID(SXNETID *a, unsigned char **out) 137i2d_SXNETID(SXNETID *a, unsigned char **out)
138{ 138{
139 return ASN1_item_i2d((ASN1_VALUE *)a, out, &SXNETID_it); 139 return ASN1_item_i2d((ASN1_VALUE *)a, out, &SXNETID_it);
140} 140}
141LCRYPTO_ALIAS(i2d_SXNETID) 141LCRYPTO_ALIAS(i2d_SXNETID);
142 142
143SXNETID * 143SXNETID *
144SXNETID_new(void) 144SXNETID_new(void)
145{ 145{
146 return (SXNETID *)ASN1_item_new(&SXNETID_it); 146 return (SXNETID *)ASN1_item_new(&SXNETID_it);
147} 147}
148LCRYPTO_ALIAS(SXNETID_new) 148LCRYPTO_ALIAS(SXNETID_new);
149 149
150void 150void
151SXNETID_free(SXNETID *a) 151SXNETID_free(SXNETID *a)
152{ 152{
153 ASN1_item_free((ASN1_VALUE *)a, &SXNETID_it); 153 ASN1_item_free((ASN1_VALUE *)a, &SXNETID_it);
154} 154}
155LCRYPTO_ALIAS(SXNETID_free) 155LCRYPTO_ALIAS(SXNETID_free);
156 156
157static const ASN1_TEMPLATE SXNET_seq_tt[] = { 157static const ASN1_TEMPLATE SXNET_seq_tt[] = {
158 { 158 {
@@ -188,28 +188,28 @@ d2i_SXNET(SXNET **a, const unsigned char **in, long len)
188 return (SXNET *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 188 return (SXNET *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
189 &SXNET_it); 189 &SXNET_it);
190} 190}
191LCRYPTO_ALIAS(d2i_SXNET) 191LCRYPTO_ALIAS(d2i_SXNET);
192 192
193int 193int
194i2d_SXNET(SXNET *a, unsigned char **out) 194i2d_SXNET(SXNET *a, unsigned char **out)
195{ 195{
196 return ASN1_item_i2d((ASN1_VALUE *)a, out, &SXNET_it); 196 return ASN1_item_i2d((ASN1_VALUE *)a, out, &SXNET_it);
197} 197}
198LCRYPTO_ALIAS(i2d_SXNET) 198LCRYPTO_ALIAS(i2d_SXNET);
199 199
200SXNET * 200SXNET *
201SXNET_new(void) 201SXNET_new(void)
202{ 202{
203 return (SXNET *)ASN1_item_new(&SXNET_it); 203 return (SXNET *)ASN1_item_new(&SXNET_it);
204} 204}
205LCRYPTO_ALIAS(SXNET_new) 205LCRYPTO_ALIAS(SXNET_new);
206 206
207void 207void
208SXNET_free(SXNET *a) 208SXNET_free(SXNET *a)
209{ 209{
210 ASN1_item_free((ASN1_VALUE *)a, &SXNET_it); 210 ASN1_item_free((ASN1_VALUE *)a, &SXNET_it);
211} 211}
212LCRYPTO_ALIAS(SXNET_free) 212LCRYPTO_ALIAS(SXNET_free);
213 213
214static int 214static int
215sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent) 215sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent)
@@ -271,7 +271,7 @@ SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, int userlen)
271 } 271 }
272 return SXNET_add_id_INTEGER(psx, izone, user, userlen); 272 return SXNET_add_id_INTEGER(psx, izone, user, userlen);
273} 273}
274LCRYPTO_ALIAS(SXNET_add_id_asc) 274LCRYPTO_ALIAS(SXNET_add_id_asc);
275 275
276/* Add an id given the zone as an unsigned long */ 276/* Add an id given the zone as an unsigned long */
277 277
@@ -289,7 +289,7 @@ SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
289 } 289 }
290 return SXNET_add_id_INTEGER(psx, izone, user, userlen); 290 return SXNET_add_id_INTEGER(psx, izone, user, userlen);
291} 291}
292LCRYPTO_ALIAS(SXNET_add_id_ulong) 292LCRYPTO_ALIAS(SXNET_add_id_ulong);
293 293
294/* Add an id given the zone as an ASN1_INTEGER. 294/* Add an id given the zone as an ASN1_INTEGER.
295 * Note this version uses the passed integer and doesn't make a copy so don't 295 * Note this version uses the passed integer and doesn't make a copy so don't
@@ -345,7 +345,7 @@ err:
345 *psx = NULL; 345 *psx = NULL;
346 return 0; 346 return 0;
347} 347}
348LCRYPTO_ALIAS(SXNET_add_id_INTEGER) 348LCRYPTO_ALIAS(SXNET_add_id_INTEGER);
349 349
350ASN1_OCTET_STRING * 350ASN1_OCTET_STRING *
351SXNET_get_id_asc(SXNET *sx, const char *zone) 351SXNET_get_id_asc(SXNET *sx, const char *zone)
@@ -361,7 +361,7 @@ SXNET_get_id_asc(SXNET *sx, const char *zone)
361 ASN1_INTEGER_free(izone); 361 ASN1_INTEGER_free(izone);
362 return oct; 362 return oct;
363} 363}
364LCRYPTO_ALIAS(SXNET_get_id_asc) 364LCRYPTO_ALIAS(SXNET_get_id_asc);
365 365
366ASN1_OCTET_STRING * 366ASN1_OCTET_STRING *
367SXNET_get_id_ulong(SXNET *sx, unsigned long lzone) 367SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
@@ -379,7 +379,7 @@ SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
379 ASN1_INTEGER_free(izone); 379 ASN1_INTEGER_free(izone);
380 return oct; 380 return oct;
381} 381}
382LCRYPTO_ALIAS(SXNET_get_id_ulong) 382LCRYPTO_ALIAS(SXNET_get_id_ulong);
383 383
384ASN1_OCTET_STRING * 384ASN1_OCTET_STRING *
385SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone) 385SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
@@ -394,4 +394,4 @@ SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
394 } 394 }
395 return NULL; 395 return NULL;
396} 396}
397LCRYPTO_ALIAS(SXNET_get_id_INTEGER) 397LCRYPTO_ALIAS(SXNET_get_id_INTEGER);