summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_crpt.c
diff options
context:
space:
mode:
authortb <>2023-02-16 08:38:17 +0000
committertb <>2023-02-16 08:38:17 +0000
commitb1fbdd21532891fac5b0f128e57331894bd69d84 (patch)
tree689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/pkcs12/p12_crpt.c
parentee0f647faa09f91cb79b628dcb818adaa381af90 (diff)
downloadopenbsd-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/pkcs12/p12_crpt.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_crpt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crpt.c b/src/lib/libcrypto/pkcs12/p12_crpt.c
index 63474621cb..e7d30101c3 100644
--- a/src/lib/libcrypto/pkcs12/p12_crpt.c
+++ b/src/lib/libcrypto/pkcs12/p12_crpt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_crpt.c,v 1.16 2022/11/12 13:03:28 beck Exp $ */ 1/* $OpenBSD: p12_crpt.c,v 1.17 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 */
@@ -68,7 +68,7 @@ void
68PKCS12_PBE_add(void) 68PKCS12_PBE_add(void)
69{ 69{
70} 70}
71LCRYPTO_ALIAS(PKCS12_PBE_add) 71LCRYPTO_ALIAS(PKCS12_PBE_add);
72 72
73int 73int
74PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 74PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
@@ -120,4 +120,4 @@ PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
120 explicit_bzero(iv, EVP_MAX_IV_LENGTH); 120 explicit_bzero(iv, EVP_MAX_IV_LENGTH);
121 return ret; 121 return ret;
122} 122}
123LCRYPTO_ALIAS(PKCS12_PBE_keyivgen) 123LCRYPTO_ALIAS(PKCS12_PBE_keyivgen);