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/pkcs12/p12_crt.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/pkcs12/p12_crt.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c index 8655be108e..90a0cbe555 100644 --- a/src/lib/libcrypto/pkcs12/p12_crt.c +++ b/src/lib/libcrypto/pkcs12/p12_crt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_crt.c,v 1.22 2023/01/24 09:48:57 job Exp $ */ | 1 | /* $OpenBSD: p12_crt.c,v 1.23 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 | */ |
| @@ -184,7 +184,7 @@ err: | |||
| 184 | sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free); | 184 | sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free); |
| 185 | return NULL; | 185 | return NULL; |
| 186 | } | 186 | } |
| 187 | LCRYPTO_ALIAS(PKCS12_create) | 187 | LCRYPTO_ALIAS(PKCS12_create); |
| 188 | 188 | ||
| 189 | PKCS12_SAFEBAG * | 189 | PKCS12_SAFEBAG * |
| 190 | PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert) | 190 | PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert) |
| @@ -222,7 +222,7 @@ err: | |||
| 222 | 222 | ||
| 223 | return NULL; | 223 | return NULL; |
| 224 | } | 224 | } |
| 225 | LCRYPTO_ALIAS(PKCS12_add_cert) | 225 | LCRYPTO_ALIAS(PKCS12_add_cert); |
| 226 | 226 | ||
| 227 | PKCS12_SAFEBAG * | 227 | PKCS12_SAFEBAG * |
| 228 | PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, int key_usage, | 228 | PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, int key_usage, |
| @@ -263,7 +263,7 @@ err: | |||
| 263 | 263 | ||
| 264 | return NULL; | 264 | return NULL; |
| 265 | } | 265 | } |
| 266 | LCRYPTO_ALIAS(PKCS12_add_key) | 266 | LCRYPTO_ALIAS(PKCS12_add_key); |
| 267 | 267 | ||
| 268 | int | 268 | int |
| 269 | PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags, | 269 | PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags, |
| @@ -307,7 +307,7 @@ err: | |||
| 307 | 307 | ||
| 308 | return 0; | 308 | return 0; |
| 309 | } | 309 | } |
| 310 | LCRYPTO_ALIAS(PKCS12_add_safe) | 310 | LCRYPTO_ALIAS(PKCS12_add_safe); |
| 311 | 311 | ||
| 312 | static int | 312 | static int |
| 313 | pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag) | 313 | pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag) |
| @@ -354,4 +354,4 @@ PKCS12_add_safes(STACK_OF(PKCS7) *safes, int nid_p7) | |||
| 354 | 354 | ||
| 355 | return p12; | 355 | return p12; |
| 356 | } | 356 | } |
| 357 | LCRYPTO_ALIAS(PKCS12_add_safes) | 357 | LCRYPTO_ALIAS(PKCS12_add_safes); |
