diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2023-02-16 08:38:18 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2023-02-16 08:38:18 +0000 |
| commit | 6d469a7e426c54c2c818f52f26357e3e6a93c10b (patch) | |
| tree | 51cf8d1b29a9e7b206a5d5ef900e1a4e7c5d214f /lib/libssl | |
| parent | 1888ae3bff0d9bb971e3bdcf160c53474c03e226 (diff) | |
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 'lib/libssl')
| -rw-r--r-- | lib/libssl/bio_ssl.c | 8 | ||||
| -rw-r--r-- | lib/libssl/hidden/ssl_namespace.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/bio_ssl.c b/lib/libssl/bio_ssl.c index 98a730d1106..1a8cda84d65 100644 --- a/lib/libssl/bio_ssl.c +++ b/lib/libssl/bio_ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_ssl.c,v 1.37 2022/11/26 16:08:55 tb Exp $ */ +/* $OpenBSD: bio_ssl.c,v 1.38 2023/02/16 08:38:17 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -103,7 +103,7 @@ BIO_f_ssl(void) { return (&methods_sslp); } -LSSL_ALIAS(BIO_f_ssl) +LSSL_ALIAS(BIO_f_ssl); static int ssl_new(BIO *bi) @@ -533,7 +533,7 @@ BIO_new_ssl_connect(SSL_CTX *ctx) BIO_free(ssl); return (NULL); } -LSSL_ALIAS(BIO_new_ssl_connect) +LSSL_ALIAS(BIO_new_ssl_connect); BIO * BIO_new_ssl(SSL_CTX *ctx, int client) @@ -558,7 +558,7 @@ BIO_new_ssl(SSL_CTX *ctx, int client) BIO_free(ret); return (NULL); } -LSSL_ALIAS(BIO_new_ssl) +LSSL_ALIAS(BIO_new_ssl); int BIO_ssl_copy_session_id(BIO *t, BIO *f) diff --git a/lib/libssl/hidden/ssl_namespace.h b/lib/libssl/hidden/ssl_namespace.h index 803f3e66bed..7a941a0e109 100644 --- a/lib/libssl/hidden/ssl_namespace.h +++ b/lib/libssl/hidden/ssl_namespace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_namespace.h,v 1.1 2022/11/11 11:25:18 beck Exp $ */ +/* $OpenBSD: ssl_namespace.h,v 1.2 2023/02/16 08:38:17 tb Exp $ */ /* * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> * @@ -27,11 +27,11 @@ #define LSSL_UNUSED(x) typeof(x) x __attribute__((deprecated)) #define LSSL_USED(x) __attribute__((visibility("hidden"))) \ typeof(x) x asm("_lssl_"#x) -#define LSSL_ALIAS(x) asm(".global "#x"; "#x" = _lssl_"#x); +#define LSSL_ALIAS(x) asm(".global "#x"; "#x" = _lssl_"#x) #else #define LSSL_UNUSED(x) #define LSSL_USED(x) -#define LSSL_ALIAS(x) +#define LSSL_ALIAS(x) asm("") #endif #endif /* _LIBSSL_SSL_NAMESPACE_H_ */ |