From b1fbdd21532891fac5b0f128e57331894bd69d84 Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 16 Feb 2023 08:38:17 +0000 Subject: 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 --- src/lib/libcrypto/x509/x509_sxnet.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/lib/libcrypto/x509/x509_sxnet.c') 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 @@ -/* $OpenBSD: x509_sxnet.c,v 1.2 2022/11/14 17:48:50 beck Exp $ */ +/* $OpenBSD: x509_sxnet.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -131,28 +131,28 @@ d2i_SXNETID(SXNETID **a, const unsigned char **in, long len) return (SXNETID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, &SXNETID_it); } -LCRYPTO_ALIAS(d2i_SXNETID) +LCRYPTO_ALIAS(d2i_SXNETID); int i2d_SXNETID(SXNETID *a, unsigned char **out) { return ASN1_item_i2d((ASN1_VALUE *)a, out, &SXNETID_it); } -LCRYPTO_ALIAS(i2d_SXNETID) +LCRYPTO_ALIAS(i2d_SXNETID); SXNETID * SXNETID_new(void) { return (SXNETID *)ASN1_item_new(&SXNETID_it); } -LCRYPTO_ALIAS(SXNETID_new) +LCRYPTO_ALIAS(SXNETID_new); void SXNETID_free(SXNETID *a) { ASN1_item_free((ASN1_VALUE *)a, &SXNETID_it); } -LCRYPTO_ALIAS(SXNETID_free) +LCRYPTO_ALIAS(SXNETID_free); static const ASN1_TEMPLATE SXNET_seq_tt[] = { { @@ -188,28 +188,28 @@ d2i_SXNET(SXNET **a, const unsigned char **in, long len) return (SXNET *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, &SXNET_it); } -LCRYPTO_ALIAS(d2i_SXNET) +LCRYPTO_ALIAS(d2i_SXNET); int i2d_SXNET(SXNET *a, unsigned char **out) { return ASN1_item_i2d((ASN1_VALUE *)a, out, &SXNET_it); } -LCRYPTO_ALIAS(i2d_SXNET) +LCRYPTO_ALIAS(i2d_SXNET); SXNET * SXNET_new(void) { return (SXNET *)ASN1_item_new(&SXNET_it); } -LCRYPTO_ALIAS(SXNET_new) +LCRYPTO_ALIAS(SXNET_new); void SXNET_free(SXNET *a) { ASN1_item_free((ASN1_VALUE *)a, &SXNET_it); } -LCRYPTO_ALIAS(SXNET_free) +LCRYPTO_ALIAS(SXNET_free); static int sxnet_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) } return SXNET_add_id_INTEGER(psx, izone, user, userlen); } -LCRYPTO_ALIAS(SXNET_add_id_asc) +LCRYPTO_ALIAS(SXNET_add_id_asc); /* Add an id given the zone as an unsigned long */ @@ -289,7 +289,7 @@ SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user, } return SXNET_add_id_INTEGER(psx, izone, user, userlen); } -LCRYPTO_ALIAS(SXNET_add_id_ulong) +LCRYPTO_ALIAS(SXNET_add_id_ulong); /* Add an id given the zone as an ASN1_INTEGER. * Note this version uses the passed integer and doesn't make a copy so don't @@ -345,7 +345,7 @@ err: *psx = NULL; return 0; } -LCRYPTO_ALIAS(SXNET_add_id_INTEGER) +LCRYPTO_ALIAS(SXNET_add_id_INTEGER); ASN1_OCTET_STRING * SXNET_get_id_asc(SXNET *sx, const char *zone) @@ -361,7 +361,7 @@ SXNET_get_id_asc(SXNET *sx, const char *zone) ASN1_INTEGER_free(izone); return oct; } -LCRYPTO_ALIAS(SXNET_get_id_asc) +LCRYPTO_ALIAS(SXNET_get_id_asc); ASN1_OCTET_STRING * SXNET_get_id_ulong(SXNET *sx, unsigned long lzone) @@ -379,7 +379,7 @@ SXNET_get_id_ulong(SXNET *sx, unsigned long lzone) ASN1_INTEGER_free(izone); return oct; } -LCRYPTO_ALIAS(SXNET_get_id_ulong) +LCRYPTO_ALIAS(SXNET_get_id_ulong); ASN1_OCTET_STRING * SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone) @@ -394,4 +394,4 @@ SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone) } return NULL; } -LCRYPTO_ALIAS(SXNET_get_id_INTEGER) +LCRYPTO_ALIAS(SXNET_get_id_INTEGER); -- cgit v1.2.3-55-g6feb