diff options
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_purp.c | |
parent | ee0f647faa09f91cb79b628dcb818adaa381af90 (diff) | |
download | openbsd-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_purp.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_purp.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/libcrypto/x509/x509_purp.c b/src/lib/libcrypto/x509/x509_purp.c index 7ec986062f..63d1df2961 100644 --- a/src/lib/libcrypto/x509/x509_purp.c +++ b/src/lib/libcrypto/x509/x509_purp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_purp.c,v 1.19 2023/01/20 22:00:47 job Exp $ */ | 1 | /* $OpenBSD: x509_purp.c,v 1.20 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 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -140,7 +140,7 @@ X509_check_purpose(X509 *x, int id, int ca) | |||
140 | pt = X509_PURPOSE_get0(idx); | 140 | pt = X509_PURPOSE_get0(idx); |
141 | return pt->check_purpose(pt, x, ca); | 141 | return pt->check_purpose(pt, x, ca); |
142 | } | 142 | } |
143 | LCRYPTO_ALIAS(X509_check_purpose) | 143 | LCRYPTO_ALIAS(X509_check_purpose); |
144 | 144 | ||
145 | int | 145 | int |
146 | X509_PURPOSE_set(int *p, int purpose) | 146 | X509_PURPOSE_set(int *p, int purpose) |
@@ -152,7 +152,7 @@ X509_PURPOSE_set(int *p, int purpose) | |||
152 | *p = purpose; | 152 | *p = purpose; |
153 | return 1; | 153 | return 1; |
154 | } | 154 | } |
155 | LCRYPTO_ALIAS(X509_PURPOSE_set) | 155 | LCRYPTO_ALIAS(X509_PURPOSE_set); |
156 | 156 | ||
157 | int | 157 | int |
158 | X509_PURPOSE_get_count(void) | 158 | X509_PURPOSE_get_count(void) |
@@ -161,7 +161,7 @@ X509_PURPOSE_get_count(void) | |||
161 | return X509_PURPOSE_COUNT; | 161 | return X509_PURPOSE_COUNT; |
162 | return sk_X509_PURPOSE_num(xptable) + X509_PURPOSE_COUNT; | 162 | return sk_X509_PURPOSE_num(xptable) + X509_PURPOSE_COUNT; |
163 | } | 163 | } |
164 | LCRYPTO_ALIAS(X509_PURPOSE_get_count) | 164 | LCRYPTO_ALIAS(X509_PURPOSE_get_count); |
165 | 165 | ||
166 | X509_PURPOSE * | 166 | X509_PURPOSE * |
167 | X509_PURPOSE_get0(int idx) | 167 | X509_PURPOSE_get0(int idx) |
@@ -172,7 +172,7 @@ X509_PURPOSE_get0(int idx) | |||
172 | return xstandard + idx; | 172 | return xstandard + idx; |
173 | return sk_X509_PURPOSE_value(xptable, idx - X509_PURPOSE_COUNT); | 173 | return sk_X509_PURPOSE_value(xptable, idx - X509_PURPOSE_COUNT); |
174 | } | 174 | } |
175 | LCRYPTO_ALIAS(X509_PURPOSE_get0) | 175 | LCRYPTO_ALIAS(X509_PURPOSE_get0); |
176 | 176 | ||
177 | int | 177 | int |
178 | X509_PURPOSE_get_by_sname(const char *sname) | 178 | X509_PURPOSE_get_by_sname(const char *sname) |
@@ -187,7 +187,7 @@ X509_PURPOSE_get_by_sname(const char *sname) | |||
187 | } | 187 | } |
188 | return -1; | 188 | return -1; |
189 | } | 189 | } |
190 | LCRYPTO_ALIAS(X509_PURPOSE_get_by_sname) | 190 | LCRYPTO_ALIAS(X509_PURPOSE_get_by_sname); |
191 | 191 | ||
192 | int | 192 | int |
193 | X509_PURPOSE_get_by_id(int purpose) | 193 | X509_PURPOSE_get_by_id(int purpose) |
@@ -205,7 +205,7 @@ X509_PURPOSE_get_by_id(int purpose) | |||
205 | return -1; | 205 | return -1; |
206 | return idx + X509_PURPOSE_COUNT; | 206 | return idx + X509_PURPOSE_COUNT; |
207 | } | 207 | } |
208 | LCRYPTO_ALIAS(X509_PURPOSE_get_by_id) | 208 | LCRYPTO_ALIAS(X509_PURPOSE_get_by_id); |
209 | 209 | ||
210 | int | 210 | int |
211 | X509_PURPOSE_add(int id, int trust, int flags, | 211 | X509_PURPOSE_add(int id, int trust, int flags, |
@@ -280,7 +280,7 @@ err: | |||
280 | X509V3error(ERR_R_MALLOC_FAILURE); | 280 | X509V3error(ERR_R_MALLOC_FAILURE); |
281 | return 0; | 281 | return 0; |
282 | } | 282 | } |
283 | LCRYPTO_ALIAS(X509_PURPOSE_add) | 283 | LCRYPTO_ALIAS(X509_PURPOSE_add); |
284 | 284 | ||
285 | static void | 285 | static void |
286 | xptable_free(X509_PURPOSE *p) | 286 | xptable_free(X509_PURPOSE *p) |
@@ -302,35 +302,35 @@ X509_PURPOSE_cleanup(void) | |||
302 | sk_X509_PURPOSE_pop_free(xptable, xptable_free); | 302 | sk_X509_PURPOSE_pop_free(xptable, xptable_free); |
303 | xptable = NULL; | 303 | xptable = NULL; |
304 | } | 304 | } |
305 | LCRYPTO_ALIAS(X509_PURPOSE_cleanup) | 305 | LCRYPTO_ALIAS(X509_PURPOSE_cleanup); |
306 | 306 | ||
307 | int | 307 | int |
308 | X509_PURPOSE_get_id(const X509_PURPOSE *xp) | 308 | X509_PURPOSE_get_id(const X509_PURPOSE *xp) |
309 | { | 309 | { |
310 | return xp->purpose; | 310 | return xp->purpose; |
311 | } | 311 | } |
312 | LCRYPTO_ALIAS(X509_PURPOSE_get_id) | 312 | LCRYPTO_ALIAS(X509_PURPOSE_get_id); |
313 | 313 | ||
314 | char * | 314 | char * |
315 | X509_PURPOSE_get0_name(const X509_PURPOSE *xp) | 315 | X509_PURPOSE_get0_name(const X509_PURPOSE *xp) |
316 | { | 316 | { |
317 | return xp->name; | 317 | return xp->name; |
318 | } | 318 | } |
319 | LCRYPTO_ALIAS(X509_PURPOSE_get0_name) | 319 | LCRYPTO_ALIAS(X509_PURPOSE_get0_name); |
320 | 320 | ||
321 | char * | 321 | char * |
322 | X509_PURPOSE_get0_sname(const X509_PURPOSE *xp) | 322 | X509_PURPOSE_get0_sname(const X509_PURPOSE *xp) |
323 | { | 323 | { |
324 | return xp->sname; | 324 | return xp->sname; |
325 | } | 325 | } |
326 | LCRYPTO_ALIAS(X509_PURPOSE_get0_sname) | 326 | LCRYPTO_ALIAS(X509_PURPOSE_get0_sname); |
327 | 327 | ||
328 | int | 328 | int |
329 | X509_PURPOSE_get_trust(const X509_PURPOSE *xp) | 329 | X509_PURPOSE_get_trust(const X509_PURPOSE *xp) |
330 | { | 330 | { |
331 | return xp->trust; | 331 | return xp->trust; |
332 | } | 332 | } |
333 | LCRYPTO_ALIAS(X509_PURPOSE_get_trust) | 333 | LCRYPTO_ALIAS(X509_PURPOSE_get_trust); |
334 | 334 | ||
335 | static int | 335 | static int |
336 | nid_cmp(const int *a, const int *b) | 336 | nid_cmp(const int *a, const int *b) |
@@ -396,7 +396,7 @@ X509_supported_extension(X509_EXTENSION *ex) | |||
396 | return 1; | 396 | return 1; |
397 | return 0; | 397 | return 0; |
398 | } | 398 | } |
399 | LCRYPTO_ALIAS(X509_supported_extension) | 399 | LCRYPTO_ALIAS(X509_supported_extension); |
400 | 400 | ||
401 | static void | 401 | static void |
402 | setup_dp(X509 *x, DIST_POINT *dp) | 402 | setup_dp(X509 *x, DIST_POINT *dp) |
@@ -690,7 +690,7 @@ X509_check_ca(X509 *x) | |||
690 | 690 | ||
691 | return check_ca(x); | 691 | return check_ca(x); |
692 | } | 692 | } |
693 | LCRYPTO_ALIAS(X509_check_ca) | 693 | LCRYPTO_ALIAS(X509_check_ca); |
694 | 694 | ||
695 | /* Check SSL CA: common checks for SSL client and server */ | 695 | /* Check SSL CA: common checks for SSL client and server */ |
696 | static int | 696 | static int |
@@ -916,7 +916,7 @@ X509_check_issued(X509 *issuer, X509 *subject) | |||
916 | return X509_V_ERR_KEYUSAGE_NO_CERTSIGN; | 916 | return X509_V_ERR_KEYUSAGE_NO_CERTSIGN; |
917 | return X509_V_OK; | 917 | return X509_V_OK; |
918 | } | 918 | } |
919 | LCRYPTO_ALIAS(X509_check_issued) | 919 | LCRYPTO_ALIAS(X509_check_issued); |
920 | 920 | ||
921 | int | 921 | int |
922 | X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid) | 922 | X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid) |
@@ -956,7 +956,7 @@ X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid) | |||
956 | } | 956 | } |
957 | return X509_V_OK; | 957 | return X509_V_OK; |
958 | } | 958 | } |
959 | LCRYPTO_ALIAS(X509_check_akid) | 959 | LCRYPTO_ALIAS(X509_check_akid); |
960 | 960 | ||
961 | uint32_t | 961 | uint32_t |
962 | X509_get_extension_flags(X509 *x) | 962 | X509_get_extension_flags(X509 *x) |
@@ -967,7 +967,7 @@ X509_get_extension_flags(X509 *x) | |||
967 | 967 | ||
968 | return x->ex_flags; | 968 | return x->ex_flags; |
969 | } | 969 | } |
970 | LCRYPTO_ALIAS(X509_get_extension_flags) | 970 | LCRYPTO_ALIAS(X509_get_extension_flags); |
971 | 971 | ||
972 | uint32_t | 972 | uint32_t |
973 | X509_get_key_usage(X509 *x) | 973 | X509_get_key_usage(X509 *x) |
@@ -981,7 +981,7 @@ X509_get_key_usage(X509 *x) | |||
981 | 981 | ||
982 | return UINT32_MAX; | 982 | return UINT32_MAX; |
983 | } | 983 | } |
984 | LCRYPTO_ALIAS(X509_get_key_usage) | 984 | LCRYPTO_ALIAS(X509_get_key_usage); |
985 | 985 | ||
986 | uint32_t | 986 | uint32_t |
987 | X509_get_extended_key_usage(X509 *x) | 987 | X509_get_extended_key_usage(X509 *x) |
@@ -995,4 +995,4 @@ X509_get_extended_key_usage(X509 *x) | |||
995 | 995 | ||
996 | return UINT32_MAX; | 996 | return UINT32_MAX; |
997 | } | 997 | } |
998 | LCRYPTO_ALIAS(X509_get_extended_key_usage) | 998 | LCRYPTO_ALIAS(X509_get_extended_key_usage); |