summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_req.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_req.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_req.c')
-rw-r--r--src/lib/libcrypto/x509/x509_req.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c
index 32415979e9..0fea7e68b4 100644
--- a/src/lib/libcrypto/x509/x509_req.c
+++ b/src/lib/libcrypto/x509/x509_req.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_req.c,v 1.31 2022/11/26 16:08:55 tb Exp $ */ 1/* $OpenBSD: x509_req.c,v 1.32 2023/02/16 08:38:17 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -115,7 +115,7 @@ err:
115 X509_REQ_free(ret); 115 X509_REQ_free(ret);
116 return (NULL); 116 return (NULL);
117} 117}
118LCRYPTO_ALIAS(X509_to_X509_REQ) 118LCRYPTO_ALIAS(X509_to_X509_REQ);
119 119
120EVP_PKEY * 120EVP_PKEY *
121X509_REQ_get_pubkey(X509_REQ *req) 121X509_REQ_get_pubkey(X509_REQ *req)
@@ -124,7 +124,7 @@ X509_REQ_get_pubkey(X509_REQ *req)
124 return (NULL); 124 return (NULL);
125 return (X509_PUBKEY_get(req->req_info->pubkey)); 125 return (X509_PUBKEY_get(req->req_info->pubkey));
126} 126}
127LCRYPTO_ALIAS(X509_REQ_get_pubkey) 127LCRYPTO_ALIAS(X509_REQ_get_pubkey);
128 128
129EVP_PKEY * 129EVP_PKEY *
130X509_REQ_get0_pubkey(X509_REQ *req) 130X509_REQ_get0_pubkey(X509_REQ *req)
@@ -133,7 +133,7 @@ X509_REQ_get0_pubkey(X509_REQ *req)
133 return NULL; 133 return NULL;
134 return X509_PUBKEY_get0(req->req_info->pubkey); 134 return X509_PUBKEY_get0(req->req_info->pubkey);
135} 135}
136LCRYPTO_ALIAS(X509_REQ_get0_pubkey) 136LCRYPTO_ALIAS(X509_REQ_get0_pubkey);
137 137
138int 138int
139X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k) 139X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
@@ -173,7 +173,7 @@ X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
173 173
174 return (ok); 174 return (ok);
175} 175}
176LCRYPTO_ALIAS(X509_REQ_check_private_key) 176LCRYPTO_ALIAS(X509_REQ_check_private_key);
177 177
178/* It seems several organisations had the same idea of including a list of 178/* It seems several organisations had the same idea of including a list of
179 * extensions in a certificate request. There are at least two OIDs that are 179 * extensions in a certificate request. There are at least two OIDs that are
@@ -197,21 +197,21 @@ X509_REQ_extension_nid(int req_nid)
197 return 1; 197 return 1;
198 } 198 }
199} 199}
200LCRYPTO_ALIAS(X509_REQ_extension_nid) 200LCRYPTO_ALIAS(X509_REQ_extension_nid);
201 201
202int * 202int *
203X509_REQ_get_extension_nids(void) 203X509_REQ_get_extension_nids(void)
204{ 204{
205 return ext_nids; 205 return ext_nids;
206} 206}
207LCRYPTO_ALIAS(X509_REQ_get_extension_nids) 207LCRYPTO_ALIAS(X509_REQ_get_extension_nids);
208 208
209void 209void
210X509_REQ_set_extension_nids(int *nids) 210X509_REQ_set_extension_nids(int *nids)
211{ 211{
212 ext_nids = nids; 212 ext_nids = nids;
213} 213}
214LCRYPTO_ALIAS(X509_REQ_set_extension_nids) 214LCRYPTO_ALIAS(X509_REQ_set_extension_nids);
215 215
216STACK_OF(X509_EXTENSION) * 216STACK_OF(X509_EXTENSION) *
217X509_REQ_get_extensions(X509_REQ *req) 217X509_REQ_get_extensions(X509_REQ *req)
@@ -238,7 +238,7 @@ X509_REQ_get_extensions(X509_REQ *req)
238 p = ext->value.sequence->data; 238 p = ext->value.sequence->data;
239 return d2i_X509_EXTENSIONS(NULL, &p, ext->value.sequence->length); 239 return d2i_X509_EXTENSIONS(NULL, &p, ext->value.sequence->length);
240} 240}
241LCRYPTO_ALIAS(X509_REQ_get_extensions) 241LCRYPTO_ALIAS(X509_REQ_get_extensions);
242 242
243/* 243/*
244 * Add a STACK_OF extensions to a certificate request: allow alternative OIDs 244 * Add a STACK_OF extensions to a certificate request: allow alternative OIDs
@@ -262,7 +262,7 @@ X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts,
262 262
263 return rv; 263 return rv;
264} 264}
265LCRYPTO_ALIAS(X509_REQ_add_extensions_nid) 265LCRYPTO_ALIAS(X509_REQ_add_extensions_nid);
266 266
267/* This is the normal usage: use the "official" OID */ 267/* This is the normal usage: use the "official" OID */
268int 268int
@@ -270,7 +270,7 @@ X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts)
270{ 270{
271 return X509_REQ_add_extensions_nid(req, exts, NID_ext_req); 271 return X509_REQ_add_extensions_nid(req, exts, NID_ext_req);
272} 272}
273LCRYPTO_ALIAS(X509_REQ_add_extensions) 273LCRYPTO_ALIAS(X509_REQ_add_extensions);
274 274
275/* Request attribute functions */ 275/* Request attribute functions */
276 276
@@ -279,14 +279,14 @@ X509_REQ_get_attr_count(const X509_REQ *req)
279{ 279{
280 return X509at_get_attr_count(req->req_info->attributes); 280 return X509at_get_attr_count(req->req_info->attributes);
281} 281}
282LCRYPTO_ALIAS(X509_REQ_get_attr_count) 282LCRYPTO_ALIAS(X509_REQ_get_attr_count);
283 283
284int 284int
285X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos) 285X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos)
286{ 286{
287 return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos); 287 return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos);
288} 288}
289LCRYPTO_ALIAS(X509_REQ_get_attr_by_NID) 289LCRYPTO_ALIAS(X509_REQ_get_attr_by_NID);
290 290
291int 291int
292X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj, 292X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
@@ -294,21 +294,21 @@ X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
294{ 294{
295 return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos); 295 return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos);
296} 296}
297LCRYPTO_ALIAS(X509_REQ_get_attr_by_OBJ) 297LCRYPTO_ALIAS(X509_REQ_get_attr_by_OBJ);
298 298
299X509_ATTRIBUTE * 299X509_ATTRIBUTE *
300X509_REQ_get_attr(const X509_REQ *req, int loc) 300X509_REQ_get_attr(const X509_REQ *req, int loc)
301{ 301{
302 return X509at_get_attr(req->req_info->attributes, loc); 302 return X509at_get_attr(req->req_info->attributes, loc);
303} 303}
304LCRYPTO_ALIAS(X509_REQ_get_attr) 304LCRYPTO_ALIAS(X509_REQ_get_attr);
305 305
306X509_ATTRIBUTE * 306X509_ATTRIBUTE *
307X509_REQ_delete_attr(X509_REQ *req, int loc) 307X509_REQ_delete_attr(X509_REQ *req, int loc)
308{ 308{
309 return X509at_delete_attr(req->req_info->attributes, loc); 309 return X509at_delete_attr(req->req_info->attributes, loc);
310} 310}
311LCRYPTO_ALIAS(X509_REQ_delete_attr) 311LCRYPTO_ALIAS(X509_REQ_delete_attr);
312 312
313int 313int
314X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr) 314X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr)
@@ -317,7 +317,7 @@ X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr)
317 return 1; 317 return 1;
318 return 0; 318 return 0;
319} 319}
320LCRYPTO_ALIAS(X509_REQ_add1_attr) 320LCRYPTO_ALIAS(X509_REQ_add1_attr);
321 321
322int 322int
323X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj, int type, 323X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj, int type,
@@ -328,7 +328,7 @@ X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj, int type,
328 return 1; 328 return 1;
329 return 0; 329 return 0;
330} 330}
331LCRYPTO_ALIAS(X509_REQ_add1_attr_by_OBJ) 331LCRYPTO_ALIAS(X509_REQ_add1_attr_by_OBJ);
332 332
333int 333int
334X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type, 334X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type,
@@ -339,7 +339,7 @@ X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type,
339 return 1; 339 return 1;
340 return 0; 340 return 0;
341} 341}
342LCRYPTO_ALIAS(X509_REQ_add1_attr_by_NID) 342LCRYPTO_ALIAS(X509_REQ_add1_attr_by_NID);
343 343
344int 344int
345X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type, 345X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type,
@@ -350,7 +350,7 @@ X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type,
350 return 1; 350 return 1;
351 return 0; 351 return 0;
352} 352}
353LCRYPTO_ALIAS(X509_REQ_add1_attr_by_txt) 353LCRYPTO_ALIAS(X509_REQ_add1_attr_by_txt);
354 354
355int 355int
356i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp) 356i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp)
@@ -358,4 +358,4 @@ i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp)
358 req->req_info->enc.modified = 1; 358 req->req_info->enc.modified = 1;
359 return i2d_X509_REQ_INFO(req->req_info, pp); 359 return i2d_X509_REQ_INFO(req->req_info, pp);
360} 360}
361LCRYPTO_ALIAS(i2d_re_X509_REQ_tbs) 361LCRYPTO_ALIAS(i2d_re_X509_REQ_tbs);