From 24a27fd0d17d515b00097199de60fa85a76a95df Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 16 Feb 2023 08:38:17 +0000 Subject: 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 --- src/lib/libcrypto/hmac/hmac.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/lib/libcrypto/hmac') diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c index 047b67b9ea..ea3a1b4a45 100644 --- a/src/lib/libcrypto/hmac/hmac.c +++ b/src/lib/libcrypto/hmac/hmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hmac.c,v 1.30 2022/11/26 16:08:53 tb Exp $ */ +/* $OpenBSD: hmac.c,v 1.31 2023/02/16 08:38:17 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -134,7 +134,7 @@ HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, err: return 0; } -LCRYPTO_ALIAS(HMAC_Init_ex) +LCRYPTO_ALIAS(HMAC_Init_ex); int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md) @@ -152,7 +152,7 @@ HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len) return EVP_DigestUpdate(&ctx->md_ctx, data, len); } -LCRYPTO_ALIAS(HMAC_Update) +LCRYPTO_ALIAS(HMAC_Update); int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) @@ -175,7 +175,7 @@ HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) err: return 0; } -LCRYPTO_ALIAS(HMAC_Final) +LCRYPTO_ALIAS(HMAC_Final); HMAC_CTX * HMAC_CTX_new(void) @@ -189,7 +189,7 @@ HMAC_CTX_new(void) return ctx; } -LCRYPTO_ALIAS(HMAC_CTX_new) +LCRYPTO_ALIAS(HMAC_CTX_new); void HMAC_CTX_free(HMAC_CTX *ctx) @@ -201,7 +201,7 @@ HMAC_CTX_free(HMAC_CTX *ctx) free(ctx); } -LCRYPTO_ALIAS(HMAC_CTX_free) +LCRYPTO_ALIAS(HMAC_CTX_free); int HMAC_CTX_reset(HMAC_CTX *ctx) @@ -236,7 +236,7 @@ HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx) err: return 0; } -LCRYPTO_ALIAS(HMAC_CTX_copy) +LCRYPTO_ALIAS(HMAC_CTX_copy); void HMAC_CTX_cleanup(HMAC_CTX *ctx) @@ -254,14 +254,14 @@ HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) EVP_MD_CTX_set_flags(&ctx->o_ctx, flags); EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); } -LCRYPTO_ALIAS(HMAC_CTX_set_flags) +LCRYPTO_ALIAS(HMAC_CTX_set_flags); const EVP_MD * HMAC_CTX_get_md(const HMAC_CTX *ctx) { return ctx->md; } -LCRYPTO_ALIAS(HMAC_CTX_get_md) +LCRYPTO_ALIAS(HMAC_CTX_get_md); unsigned char * HMAC(const EVP_MD *evp_md, const void *key, int key_len, const unsigned char *d, @@ -290,4 +290,4 @@ err: HMAC_CTX_cleanup(&c); return NULL; } -LCRYPTO_ALIAS(HMAC) +LCRYPTO_ALIAS(HMAC); -- cgit v1.2.3-55-g6feb