diff options
| author | tb <> | 2023-02-16 08:38:17 +0000 |
|---|---|---|
| committer | tb <> | 2023-02-16 08:38:17 +0000 |
| commit | 24a27fd0d17d515b00097199de60fa85a76a95df (patch) | |
| tree | 689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/x509/x509_genn.c | |
| parent | 3170d87c6599656e7568dca509714cf70723f0d2 (diff) | |
| download | openbsd-24a27fd0d17d515b00097199de60fa85a76a95df.tar.gz openbsd-24a27fd0d17d515b00097199de60fa85a76a95df.tar.bz2 openbsd-24a27fd0d17d515b00097199de60fa85a76a95df.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_genn.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_genn.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/libcrypto/x509/x509_genn.c b/src/lib/libcrypto/x509/x509_genn.c index 395d487f8f..0c03396e0d 100644 --- a/src/lib/libcrypto/x509/x509_genn.c +++ b/src/lib/libcrypto/x509/x509_genn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_genn.c,v 1.4 2023/02/07 15:46:58 tb Exp $ */ | 1 | /* $OpenBSD: x509_genn.c,v 1.5 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 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -98,28 +98,28 @@ d2i_OTHERNAME(OTHERNAME **a, const unsigned char **in, long len) | |||
| 98 | return (OTHERNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 98 | return (OTHERNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 99 | &OTHERNAME_it); | 99 | &OTHERNAME_it); |
| 100 | } | 100 | } |
| 101 | LCRYPTO_ALIAS(d2i_OTHERNAME) | 101 | LCRYPTO_ALIAS(d2i_OTHERNAME); |
| 102 | 102 | ||
| 103 | int | 103 | int |
| 104 | i2d_OTHERNAME(OTHERNAME *a, unsigned char **out) | 104 | i2d_OTHERNAME(OTHERNAME *a, unsigned char **out) |
| 105 | { | 105 | { |
| 106 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &OTHERNAME_it); | 106 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &OTHERNAME_it); |
| 107 | } | 107 | } |
| 108 | LCRYPTO_ALIAS(i2d_OTHERNAME) | 108 | LCRYPTO_ALIAS(i2d_OTHERNAME); |
| 109 | 109 | ||
| 110 | OTHERNAME * | 110 | OTHERNAME * |
| 111 | OTHERNAME_new(void) | 111 | OTHERNAME_new(void) |
| 112 | { | 112 | { |
| 113 | return (OTHERNAME *)ASN1_item_new(&OTHERNAME_it); | 113 | return (OTHERNAME *)ASN1_item_new(&OTHERNAME_it); |
| 114 | } | 114 | } |
| 115 | LCRYPTO_ALIAS(OTHERNAME_new) | 115 | LCRYPTO_ALIAS(OTHERNAME_new); |
| 116 | 116 | ||
| 117 | void | 117 | void |
| 118 | OTHERNAME_free(OTHERNAME *a) | 118 | OTHERNAME_free(OTHERNAME *a) |
| 119 | { | 119 | { |
| 120 | ASN1_item_free((ASN1_VALUE *)a, &OTHERNAME_it); | 120 | ASN1_item_free((ASN1_VALUE *)a, &OTHERNAME_it); |
| 121 | } | 121 | } |
| 122 | LCRYPTO_ALIAS(OTHERNAME_free) | 122 | LCRYPTO_ALIAS(OTHERNAME_free); |
| 123 | 123 | ||
| 124 | /* Uses explicit tagging since DIRECTORYSTRING is a CHOICE type */ | 124 | /* Uses explicit tagging since DIRECTORYSTRING is a CHOICE type */ |
| 125 | static const ASN1_TEMPLATE EDIPARTYNAME_seq_tt[] = { | 125 | static const ASN1_TEMPLATE EDIPARTYNAME_seq_tt[] = { |
| @@ -156,28 +156,28 @@ d2i_EDIPARTYNAME(EDIPARTYNAME **a, const unsigned char **in, long len) | |||
| 156 | return (EDIPARTYNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 156 | return (EDIPARTYNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 157 | &EDIPARTYNAME_it); | 157 | &EDIPARTYNAME_it); |
| 158 | } | 158 | } |
| 159 | LCRYPTO_ALIAS(d2i_EDIPARTYNAME) | 159 | LCRYPTO_ALIAS(d2i_EDIPARTYNAME); |
| 160 | 160 | ||
| 161 | int | 161 | int |
| 162 | i2d_EDIPARTYNAME(EDIPARTYNAME *a, unsigned char **out) | 162 | i2d_EDIPARTYNAME(EDIPARTYNAME *a, unsigned char **out) |
| 163 | { | 163 | { |
| 164 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &EDIPARTYNAME_it); | 164 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &EDIPARTYNAME_it); |
| 165 | } | 165 | } |
| 166 | LCRYPTO_ALIAS(i2d_EDIPARTYNAME) | 166 | LCRYPTO_ALIAS(i2d_EDIPARTYNAME); |
| 167 | 167 | ||
| 168 | EDIPARTYNAME * | 168 | EDIPARTYNAME * |
| 169 | EDIPARTYNAME_new(void) | 169 | EDIPARTYNAME_new(void) |
| 170 | { | 170 | { |
| 171 | return (EDIPARTYNAME *)ASN1_item_new(&EDIPARTYNAME_it); | 171 | return (EDIPARTYNAME *)ASN1_item_new(&EDIPARTYNAME_it); |
| 172 | } | 172 | } |
| 173 | LCRYPTO_ALIAS(EDIPARTYNAME_new) | 173 | LCRYPTO_ALIAS(EDIPARTYNAME_new); |
| 174 | 174 | ||
| 175 | void | 175 | void |
| 176 | EDIPARTYNAME_free(EDIPARTYNAME *a) | 176 | EDIPARTYNAME_free(EDIPARTYNAME *a) |
| 177 | { | 177 | { |
| 178 | ASN1_item_free((ASN1_VALUE *)a, &EDIPARTYNAME_it); | 178 | ASN1_item_free((ASN1_VALUE *)a, &EDIPARTYNAME_it); |
| 179 | } | 179 | } |
| 180 | LCRYPTO_ALIAS(EDIPARTYNAME_free) | 180 | LCRYPTO_ALIAS(EDIPARTYNAME_free); |
| 181 | 181 | ||
| 182 | static const ASN1_TEMPLATE GENERAL_NAME_ch_tt[] = { | 182 | static const ASN1_TEMPLATE GENERAL_NAME_ch_tt[] = { |
| 183 | { | 183 | { |
| @@ -264,28 +264,28 @@ d2i_GENERAL_NAME(GENERAL_NAME **a, const unsigned char **in, long len) | |||
| 264 | return (GENERAL_NAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 264 | return (GENERAL_NAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 265 | &GENERAL_NAME_it); | 265 | &GENERAL_NAME_it); |
| 266 | } | 266 | } |
| 267 | LCRYPTO_ALIAS(d2i_GENERAL_NAME) | 267 | LCRYPTO_ALIAS(d2i_GENERAL_NAME); |
| 268 | 268 | ||
| 269 | int | 269 | int |
| 270 | i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **out) | 270 | i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **out) |
| 271 | { | 271 | { |
| 272 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAME_it); | 272 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAME_it); |
| 273 | } | 273 | } |
| 274 | LCRYPTO_ALIAS(i2d_GENERAL_NAME) | 274 | LCRYPTO_ALIAS(i2d_GENERAL_NAME); |
| 275 | 275 | ||
| 276 | GENERAL_NAME * | 276 | GENERAL_NAME * |
| 277 | GENERAL_NAME_new(void) | 277 | GENERAL_NAME_new(void) |
| 278 | { | 278 | { |
| 279 | return (GENERAL_NAME *)ASN1_item_new(&GENERAL_NAME_it); | 279 | return (GENERAL_NAME *)ASN1_item_new(&GENERAL_NAME_it); |
| 280 | } | 280 | } |
| 281 | LCRYPTO_ALIAS(GENERAL_NAME_new) | 281 | LCRYPTO_ALIAS(GENERAL_NAME_new); |
| 282 | 282 | ||
| 283 | void | 283 | void |
| 284 | GENERAL_NAME_free(GENERAL_NAME *a) | 284 | GENERAL_NAME_free(GENERAL_NAME *a) |
| 285 | { | 285 | { |
| 286 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAME_it); | 286 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAME_it); |
| 287 | } | 287 | } |
| 288 | LCRYPTO_ALIAS(GENERAL_NAME_free) | 288 | LCRYPTO_ALIAS(GENERAL_NAME_free); |
| 289 | 289 | ||
| 290 | static const ASN1_TEMPLATE GENERAL_NAMES_item_tt = { | 290 | static const ASN1_TEMPLATE GENERAL_NAMES_item_tt = { |
| 291 | .flags = ASN1_TFLG_SEQUENCE_OF, | 291 | .flags = ASN1_TFLG_SEQUENCE_OF, |
| @@ -312,35 +312,35 @@ d2i_GENERAL_NAMES(GENERAL_NAMES **a, const unsigned char **in, long len) | |||
| 312 | return (GENERAL_NAMES *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 312 | return (GENERAL_NAMES *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 313 | &GENERAL_NAMES_it); | 313 | &GENERAL_NAMES_it); |
| 314 | } | 314 | } |
| 315 | LCRYPTO_ALIAS(d2i_GENERAL_NAMES) | 315 | LCRYPTO_ALIAS(d2i_GENERAL_NAMES); |
| 316 | 316 | ||
| 317 | int | 317 | int |
| 318 | i2d_GENERAL_NAMES(GENERAL_NAMES *a, unsigned char **out) | 318 | i2d_GENERAL_NAMES(GENERAL_NAMES *a, unsigned char **out) |
| 319 | { | 319 | { |
| 320 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAMES_it); | 320 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAMES_it); |
| 321 | } | 321 | } |
| 322 | LCRYPTO_ALIAS(i2d_GENERAL_NAMES) | 322 | LCRYPTO_ALIAS(i2d_GENERAL_NAMES); |
| 323 | 323 | ||
| 324 | GENERAL_NAMES * | 324 | GENERAL_NAMES * |
| 325 | GENERAL_NAMES_new(void) | 325 | GENERAL_NAMES_new(void) |
| 326 | { | 326 | { |
| 327 | return (GENERAL_NAMES *)ASN1_item_new(&GENERAL_NAMES_it); | 327 | return (GENERAL_NAMES *)ASN1_item_new(&GENERAL_NAMES_it); |
| 328 | } | 328 | } |
| 329 | LCRYPTO_ALIAS(GENERAL_NAMES_new) | 329 | LCRYPTO_ALIAS(GENERAL_NAMES_new); |
| 330 | 330 | ||
| 331 | void | 331 | void |
| 332 | GENERAL_NAMES_free(GENERAL_NAMES *a) | 332 | GENERAL_NAMES_free(GENERAL_NAMES *a) |
| 333 | { | 333 | { |
| 334 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAMES_it); | 334 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAMES_it); |
| 335 | } | 335 | } |
| 336 | LCRYPTO_ALIAS(GENERAL_NAMES_free) | 336 | LCRYPTO_ALIAS(GENERAL_NAMES_free); |
| 337 | 337 | ||
| 338 | GENERAL_NAME * | 338 | GENERAL_NAME * |
| 339 | GENERAL_NAME_dup(GENERAL_NAME *a) | 339 | GENERAL_NAME_dup(GENERAL_NAME *a) |
| 340 | { | 340 | { |
| 341 | return ASN1_item_dup(&GENERAL_NAME_it, a); | 341 | return ASN1_item_dup(&GENERAL_NAME_it, a); |
| 342 | } | 342 | } |
| 343 | LCRYPTO_ALIAS(GENERAL_NAME_dup) | 343 | LCRYPTO_ALIAS(GENERAL_NAME_dup); |
| 344 | 344 | ||
| 345 | static int | 345 | static int |
| 346 | EDIPARTYNAME_cmp(const EDIPARTYNAME *a, const EDIPARTYNAME *b) | 346 | EDIPARTYNAME_cmp(const EDIPARTYNAME *a, const EDIPARTYNAME *b) |
| @@ -415,7 +415,7 @@ GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b) | |||
| 415 | } | 415 | } |
| 416 | return result; | 416 | return result; |
| 417 | } | 417 | } |
| 418 | LCRYPTO_ALIAS(GENERAL_NAME_cmp) | 418 | LCRYPTO_ALIAS(GENERAL_NAME_cmp); |
| 419 | 419 | ||
| 420 | /* Returns 0 if they are equal, != 0 otherwise. */ | 420 | /* Returns 0 if they are equal, != 0 otherwise. */ |
| 421 | int | 421 | int |
| @@ -432,7 +432,7 @@ OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b) | |||
| 432 | result = ASN1_TYPE_cmp(a->value, b->value); | 432 | result = ASN1_TYPE_cmp(a->value, b->value); |
| 433 | return result; | 433 | return result; |
| 434 | } | 434 | } |
| 435 | LCRYPTO_ALIAS(OTHERNAME_cmp) | 435 | LCRYPTO_ALIAS(OTHERNAME_cmp); |
| 436 | 436 | ||
| 437 | void | 437 | void |
| 438 | GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) | 438 | GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) |
| @@ -470,7 +470,7 @@ GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) | |||
| 470 | } | 470 | } |
| 471 | a->type = type; | 471 | a->type = type; |
| 472 | } | 472 | } |
| 473 | LCRYPTO_ALIAS(GENERAL_NAME_set0_value) | 473 | LCRYPTO_ALIAS(GENERAL_NAME_set0_value); |
| 474 | 474 | ||
| 475 | void * | 475 | void * |
| 476 | GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype) | 476 | GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype) |
| @@ -505,7 +505,7 @@ GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype) | |||
| 505 | return NULL; | 505 | return NULL; |
| 506 | } | 506 | } |
| 507 | } | 507 | } |
| 508 | LCRYPTO_ALIAS(GENERAL_NAME_get0_value) | 508 | LCRYPTO_ALIAS(GENERAL_NAME_get0_value); |
| 509 | 509 | ||
| 510 | int | 510 | int |
| 511 | GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid, | 511 | GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid, |
| @@ -521,7 +521,7 @@ GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid, | |||
| 521 | GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth); | 521 | GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth); |
| 522 | return 1; | 522 | return 1; |
| 523 | } | 523 | } |
| 524 | LCRYPTO_ALIAS(GENERAL_NAME_set0_othername) | 524 | LCRYPTO_ALIAS(GENERAL_NAME_set0_othername); |
| 525 | 525 | ||
| 526 | int | 526 | int |
| 527 | GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, ASN1_OBJECT **poid, | 527 | GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, ASN1_OBJECT **poid, |
| @@ -535,4 +535,4 @@ GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, ASN1_OBJECT **poid, | |||
| 535 | *pvalue = gen->d.otherName->value; | 535 | *pvalue = gen->d.otherName->value; |
| 536 | return 1; | 536 | return 1; |
| 537 | } | 537 | } |
| 538 | LCRYPTO_ALIAS(GENERAL_NAME_get0_otherName) | 538 | LCRYPTO_ALIAS(GENERAL_NAME_get0_otherName); |
