diff options
author | Theo Buehler <tb@cvs.openbsd.org> | 2023-02-16 08:38:18 +0000 |
---|---|---|
committer | Theo Buehler <tb@cvs.openbsd.org> | 2023-02-16 08:38:18 +0000 |
commit | 6d469a7e426c54c2c818f52f26357e3e6a93c10b (patch) | |
tree | 51cf8d1b29a9e7b206a5d5ef900e1a4e7c5d214f /lib/libcrypto/x509/x509_v3.c | |
parent | 1888ae3bff0d9bb971e3bdcf160c53474c03e226 (diff) |
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 'lib/libcrypto/x509/x509_v3.c')
-rw-r--r-- | lib/libcrypto/x509/x509_v3.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/libcrypto/x509/x509_v3.c b/lib/libcrypto/x509/x509_v3.c index 27f670c450f..8dddb463ce0 100644 --- a/lib/libcrypto/x509/x509_v3.c +++ b/lib/libcrypto/x509/x509_v3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_v3.c,v 1.20 2022/11/26 16:08:55 tb Exp $ */ +/* $OpenBSD: x509_v3.c,v 1.21 2023/02/16 08:38:17 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -75,7 +75,7 @@ X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x) return (0); return (sk_X509_EXTENSION_num(x)); } -LCRYPTO_ALIAS(X509v3_get_ext_count) +LCRYPTO_ALIAS(X509v3_get_ext_count); int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid, int lastpos) @@ -87,7 +87,7 @@ X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid, int lastpos) return (-2); return (X509v3_get_ext_by_OBJ(x, obj, lastpos)); } -LCRYPTO_ALIAS(X509v3_get_ext_by_NID) +LCRYPTO_ALIAS(X509v3_get_ext_by_NID); int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, @@ -109,7 +109,7 @@ X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, } return (-1); } -LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ) +LCRYPTO_ALIAS(X509v3_get_ext_by_OBJ); int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, @@ -132,7 +132,7 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, } return (-1); } -LCRYPTO_ALIAS(X509v3_get_ext_by_critical) +LCRYPTO_ALIAS(X509v3_get_ext_by_critical); X509_EXTENSION * X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc) @@ -142,7 +142,7 @@ X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc) else return sk_X509_EXTENSION_value(x, loc); } -LCRYPTO_ALIAS(X509v3_get_ext) +LCRYPTO_ALIAS(X509v3_get_ext); X509_EXTENSION * X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc) @@ -154,7 +154,7 @@ X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc) ret = sk_X509_EXTENSION_delete(x, loc); return (ret); } -LCRYPTO_ALIAS(X509v3_delete_ext) +LCRYPTO_ALIAS(X509v3_delete_ext); STACK_OF(X509_EXTENSION) * X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ex, int loc) @@ -197,7 +197,7 @@ err2: sk_X509_EXTENSION_free(sk); return (NULL); } -LCRYPTO_ALIAS(X509v3_add_ext) +LCRYPTO_ALIAS(X509v3_add_ext); X509_EXTENSION * X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, @@ -216,7 +216,7 @@ X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, ASN1_OBJECT_free(obj); return (ret); } -LCRYPTO_ALIAS(X509_EXTENSION_create_by_NID) +LCRYPTO_ALIAS(X509_EXTENSION_create_by_NID); X509_EXTENSION * X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, const ASN1_OBJECT *obj, @@ -248,7 +248,7 @@ err: X509_EXTENSION_free(ret); return (NULL); } -LCRYPTO_ALIAS(X509_EXTENSION_create_by_OBJ) +LCRYPTO_ALIAS(X509_EXTENSION_create_by_OBJ); int X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj) @@ -259,7 +259,7 @@ X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj) ex->object = OBJ_dup(obj); return ex->object != NULL; } -LCRYPTO_ALIAS(X509_EXTENSION_set_object) +LCRYPTO_ALIAS(X509_EXTENSION_set_object); int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit) @@ -269,7 +269,7 @@ X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit) ex->critical = (crit) ? 0xFF : -1; return (1); } -LCRYPTO_ALIAS(X509_EXTENSION_set_critical) +LCRYPTO_ALIAS(X509_EXTENSION_set_critical); int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data) @@ -283,7 +283,7 @@ X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data) return (0); return (1); } -LCRYPTO_ALIAS(X509_EXTENSION_set_data) +LCRYPTO_ALIAS(X509_EXTENSION_set_data); ASN1_OBJECT * X509_EXTENSION_get_object(X509_EXTENSION *ex) @@ -292,7 +292,7 @@ X509_EXTENSION_get_object(X509_EXTENSION *ex) return (NULL); return (ex->object); } -LCRYPTO_ALIAS(X509_EXTENSION_get_object) +LCRYPTO_ALIAS(X509_EXTENSION_get_object); ASN1_OCTET_STRING * X509_EXTENSION_get_data(X509_EXTENSION *ex) @@ -301,7 +301,7 @@ X509_EXTENSION_get_data(X509_EXTENSION *ex) return (NULL); return (ex->value); } -LCRYPTO_ALIAS(X509_EXTENSION_get_data) +LCRYPTO_ALIAS(X509_EXTENSION_get_data); int X509_EXTENSION_get_critical(const X509_EXTENSION *ex) @@ -312,4 +312,4 @@ X509_EXTENSION_get_critical(const X509_EXTENSION *ex) return 1; return 0; } -LCRYPTO_ALIAS(X509_EXTENSION_get_critical) +LCRYPTO_ALIAS(X509_EXTENSION_get_critical); |