summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_purp.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_purp.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_purp.c')
-rw-r--r--src/lib/libcrypto/x509/x509_purp.c40
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}
143LCRYPTO_ALIAS(X509_check_purpose) 143LCRYPTO_ALIAS(X509_check_purpose);
144 144
145int 145int
146X509_PURPOSE_set(int *p, int purpose) 146X509_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}
155LCRYPTO_ALIAS(X509_PURPOSE_set) 155LCRYPTO_ALIAS(X509_PURPOSE_set);
156 156
157int 157int
158X509_PURPOSE_get_count(void) 158X509_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}
164LCRYPTO_ALIAS(X509_PURPOSE_get_count) 164LCRYPTO_ALIAS(X509_PURPOSE_get_count);
165 165
166X509_PURPOSE * 166X509_PURPOSE *
167X509_PURPOSE_get0(int idx) 167X509_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}
175LCRYPTO_ALIAS(X509_PURPOSE_get0) 175LCRYPTO_ALIAS(X509_PURPOSE_get0);
176 176
177int 177int
178X509_PURPOSE_get_by_sname(const char *sname) 178X509_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}
190LCRYPTO_ALIAS(X509_PURPOSE_get_by_sname) 190LCRYPTO_ALIAS(X509_PURPOSE_get_by_sname);
191 191
192int 192int
193X509_PURPOSE_get_by_id(int purpose) 193X509_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}
208LCRYPTO_ALIAS(X509_PURPOSE_get_by_id) 208LCRYPTO_ALIAS(X509_PURPOSE_get_by_id);
209 209
210int 210int
211X509_PURPOSE_add(int id, int trust, int flags, 211X509_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}
283LCRYPTO_ALIAS(X509_PURPOSE_add) 283LCRYPTO_ALIAS(X509_PURPOSE_add);
284 284
285static void 285static void
286xptable_free(X509_PURPOSE *p) 286xptable_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}
305LCRYPTO_ALIAS(X509_PURPOSE_cleanup) 305LCRYPTO_ALIAS(X509_PURPOSE_cleanup);
306 306
307int 307int
308X509_PURPOSE_get_id(const X509_PURPOSE *xp) 308X509_PURPOSE_get_id(const X509_PURPOSE *xp)
309{ 309{
310 return xp->purpose; 310 return xp->purpose;
311} 311}
312LCRYPTO_ALIAS(X509_PURPOSE_get_id) 312LCRYPTO_ALIAS(X509_PURPOSE_get_id);
313 313
314char * 314char *
315X509_PURPOSE_get0_name(const X509_PURPOSE *xp) 315X509_PURPOSE_get0_name(const X509_PURPOSE *xp)
316{ 316{
317 return xp->name; 317 return xp->name;
318} 318}
319LCRYPTO_ALIAS(X509_PURPOSE_get0_name) 319LCRYPTO_ALIAS(X509_PURPOSE_get0_name);
320 320
321char * 321char *
322X509_PURPOSE_get0_sname(const X509_PURPOSE *xp) 322X509_PURPOSE_get0_sname(const X509_PURPOSE *xp)
323{ 323{
324 return xp->sname; 324 return xp->sname;
325} 325}
326LCRYPTO_ALIAS(X509_PURPOSE_get0_sname) 326LCRYPTO_ALIAS(X509_PURPOSE_get0_sname);
327 327
328int 328int
329X509_PURPOSE_get_trust(const X509_PURPOSE *xp) 329X509_PURPOSE_get_trust(const X509_PURPOSE *xp)
330{ 330{
331 return xp->trust; 331 return xp->trust;
332} 332}
333LCRYPTO_ALIAS(X509_PURPOSE_get_trust) 333LCRYPTO_ALIAS(X509_PURPOSE_get_trust);
334 334
335static int 335static int
336nid_cmp(const int *a, const int *b) 336nid_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}
399LCRYPTO_ALIAS(X509_supported_extension) 399LCRYPTO_ALIAS(X509_supported_extension);
400 400
401static void 401static void
402setup_dp(X509 *x, DIST_POINT *dp) 402setup_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}
693LCRYPTO_ALIAS(X509_check_ca) 693LCRYPTO_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 */
696static int 696static 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}
919LCRYPTO_ALIAS(X509_check_issued) 919LCRYPTO_ALIAS(X509_check_issued);
920 920
921int 921int
922X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid) 922X509_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}
959LCRYPTO_ALIAS(X509_check_akid) 959LCRYPTO_ALIAS(X509_check_akid);
960 960
961uint32_t 961uint32_t
962X509_get_extension_flags(X509 *x) 962X509_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}
970LCRYPTO_ALIAS(X509_get_extension_flags) 970LCRYPTO_ALIAS(X509_get_extension_flags);
971 971
972uint32_t 972uint32_t
973X509_get_key_usage(X509 *x) 973X509_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}
984LCRYPTO_ALIAS(X509_get_key_usage) 984LCRYPTO_ALIAS(X509_get_key_usage);
985 985
986uint32_t 986uint32_t
987X509_get_extended_key_usage(X509 *x) 987X509_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}
998LCRYPTO_ALIAS(X509_get_extended_key_usage) 998LCRYPTO_ALIAS(X509_get_extended_key_usage);