summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_p8d.c
diff options
context:
space:
mode:
authortb <>2023-02-16 08:38:17 +0000
committertb <>2023-02-16 08:38:17 +0000
commit24a27fd0d17d515b00097199de60fa85a76a95df (patch)
tree689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/pkcs12/p12_p8d.c
parent3170d87c6599656e7568dca509714cf70723f0d2 (diff)
downloadopenbsd-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_p8d.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_p8d.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_p8d.c b/src/lib/libcrypto/pkcs12/p12_p8d.c
index 53942a1d70..dd5e8d9875 100644
--- a/src/lib/libcrypto/pkcs12/p12_p8d.c
+++ b/src/lib/libcrypto/pkcs12/p12_p8d.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_p8d.c,v 1.10 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: p12_p8d.c,v 1.11 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 2001. 3 * project 2001.
4 */ 4 */
@@ -68,4 +68,4 @@ PKCS8_decrypt(const X509_SIG *p8, const char *pass, int passlen)
68 return PKCS12_item_decrypt_d2i(p8->algor, 68 return PKCS12_item_decrypt_d2i(p8->algor,
69 &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8->digest, 1); 69 &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8->digest, 1);
70} 70}
71LCRYPTO_ALIAS(PKCS8_decrypt) 71LCRYPTO_ALIAS(PKCS8_decrypt);