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_ncons.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_ncons.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_ncons.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_ncons.c b/src/lib/libcrypto/x509/x509_ncons.c index c7e4e6ed9f..159e3c2563 100644 --- a/src/lib/libcrypto/x509/x509_ncons.c +++ b/src/lib/libcrypto/x509/x509_ncons.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_ncons.c,v 1.8 2022/12/26 07:18:53 jmc Exp $ */ | 1 | /* $OpenBSD: x509_ncons.c,v 1.9 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. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -165,28 +165,28 @@ GENERAL_SUBTREE_new(void) | |||
| 165 | { | 165 | { |
| 166 | return (GENERAL_SUBTREE*)ASN1_item_new(&GENERAL_SUBTREE_it); | 166 | return (GENERAL_SUBTREE*)ASN1_item_new(&GENERAL_SUBTREE_it); |
| 167 | } | 167 | } |
| 168 | LCRYPTO_ALIAS(GENERAL_SUBTREE_new) | 168 | LCRYPTO_ALIAS(GENERAL_SUBTREE_new); |
| 169 | 169 | ||
| 170 | void | 170 | void |
| 171 | GENERAL_SUBTREE_free(GENERAL_SUBTREE *a) | 171 | GENERAL_SUBTREE_free(GENERAL_SUBTREE *a) |
| 172 | { | 172 | { |
| 173 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_SUBTREE_it); | 173 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_SUBTREE_it); |
| 174 | } | 174 | } |
| 175 | LCRYPTO_ALIAS(GENERAL_SUBTREE_free) | 175 | LCRYPTO_ALIAS(GENERAL_SUBTREE_free); |
| 176 | 176 | ||
| 177 | NAME_CONSTRAINTS * | 177 | NAME_CONSTRAINTS * |
| 178 | NAME_CONSTRAINTS_new(void) | 178 | NAME_CONSTRAINTS_new(void) |
| 179 | { | 179 | { |
| 180 | return (NAME_CONSTRAINTS*)ASN1_item_new(&NAME_CONSTRAINTS_it); | 180 | return (NAME_CONSTRAINTS*)ASN1_item_new(&NAME_CONSTRAINTS_it); |
| 181 | } | 181 | } |
| 182 | LCRYPTO_ALIAS(NAME_CONSTRAINTS_new) | 182 | LCRYPTO_ALIAS(NAME_CONSTRAINTS_new); |
| 183 | 183 | ||
| 184 | void | 184 | void |
| 185 | NAME_CONSTRAINTS_free(NAME_CONSTRAINTS *a) | 185 | NAME_CONSTRAINTS_free(NAME_CONSTRAINTS *a) |
| 186 | { | 186 | { |
| 187 | ASN1_item_free((ASN1_VALUE *)a, &NAME_CONSTRAINTS_it); | 187 | ASN1_item_free((ASN1_VALUE *)a, &NAME_CONSTRAINTS_it); |
| 188 | } | 188 | } |
| 189 | LCRYPTO_ALIAS(NAME_CONSTRAINTS_free) | 189 | LCRYPTO_ALIAS(NAME_CONSTRAINTS_free); |
| 190 | 190 | ||
| 191 | static void * | 191 | static void * |
| 192 | v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | 192 | v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, |
| @@ -353,7 +353,7 @@ NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc) | |||
| 353 | } | 353 | } |
| 354 | return X509_V_OK; | 354 | return X509_V_OK; |
| 355 | } | 355 | } |
| 356 | LCRYPTO_ALIAS(NAME_CONSTRAINTS_check) | 356 | LCRYPTO_ALIAS(NAME_CONSTRAINTS_check); |
| 357 | static int | 357 | static int |
| 358 | nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc) | 358 | nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc) |
| 359 | { | 359 | { |