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_decr.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_decr.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_decr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c index 2d3d284a53..ea7f6a5ffa 100644 --- a/src/lib/libcrypto/pkcs12/p12_decr.c +++ b/src/lib/libcrypto/pkcs12/p12_decr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_decr.c,v 1.23 2022/11/26 16:08:53 tb Exp $ */ | 1 | /* $OpenBSD: p12_decr.c,v 1.24 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 | */ |
| @@ -116,7 +116,7 @@ err: | |||
| 116 | return out; | 116 | return out; |
| 117 | 117 | ||
| 118 | } | 118 | } |
| 119 | LCRYPTO_ALIAS(PKCS12_pbe_crypt) | 119 | LCRYPTO_ALIAS(PKCS12_pbe_crypt); |
| 120 | 120 | ||
| 121 | /* Decrypt an OCTET STRING and decode ASN1 structure | 121 | /* Decrypt an OCTET STRING and decode ASN1 structure |
| 122 | * if zbuf set zero buffer after use. | 122 | * if zbuf set zero buffer after use. |
| @@ -145,7 +145,7 @@ PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it, | |||
| 145 | free(out); | 145 | free(out); |
| 146 | return ret; | 146 | return ret; |
| 147 | } | 147 | } |
| 148 | LCRYPTO_ALIAS(PKCS12_item_decrypt_d2i) | 148 | LCRYPTO_ALIAS(PKCS12_item_decrypt_d2i); |
| 149 | 149 | ||
| 150 | /* Encode ASN1 structure and encrypt, return OCTET STRING | 150 | /* Encode ASN1 structure and encrypt, return OCTET STRING |
| 151 | * if zbuf set zero encoding. | 151 | * if zbuf set zero encoding. |
| @@ -184,6 +184,6 @@ err: | |||
| 184 | ASN1_OCTET_STRING_free(oct); | 184 | ASN1_OCTET_STRING_free(oct); |
| 185 | return NULL; | 185 | return NULL; |
| 186 | } | 186 | } |
| 187 | LCRYPTO_ALIAS(PKCS12_item_i2d_encrypt) | 187 | LCRYPTO_ALIAS(PKCS12_item_i2d_encrypt); |
| 188 | 188 | ||
| 189 | IMPLEMENT_PKCS12_STACK_OF(PKCS7) | 189 | IMPLEMENT_PKCS12_STACK_OF(PKCS7) |
