From b1fbdd21532891fac5b0f128e57331894bd69d84 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/x509/x509_cmp.c | 52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'src/lib/libcrypto/x509/x509_cmp.c')

diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
index b76c9ea660..3ee4fd4a5d 100644
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ b/src/lib/libcrypto/x509/x509_cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_cmp.c,v 1.41 2022/11/26 16:08:54 tb Exp $ */
+/* $OpenBSD: x509_cmp.c,v 1.42 2023/02/16 08:38:17 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,7 +84,7 @@ X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 		return (i);
 	return (X509_NAME_cmp(ai->issuer, bi->issuer));
 }
-LCRYPTO_ALIAS(X509_issuer_and_serial_cmp)
+LCRYPTO_ALIAS(X509_issuer_and_serial_cmp);
 
 #ifndef OPENSSL_NO_MD5
 unsigned long
@@ -120,7 +120,7 @@ err:
 	free(f);
 	return (ret);
 }
-LCRYPTO_ALIAS(X509_issuer_and_serial_hash)
+LCRYPTO_ALIAS(X509_issuer_and_serial_hash);
 #endif
 
 int
@@ -128,21 +128,21 @@ X509_issuer_name_cmp(const X509 *a, const X509 *b)
 {
 	return (X509_NAME_cmp(a->cert_info->issuer, b->cert_info->issuer));
 }
-LCRYPTO_ALIAS(X509_issuer_name_cmp)
+LCRYPTO_ALIAS(X509_issuer_name_cmp);
 
 int
 X509_subject_name_cmp(const X509 *a, const X509 *b)
 {
 	return (X509_NAME_cmp(a->cert_info->subject, b->cert_info->subject));
 }
-LCRYPTO_ALIAS(X509_subject_name_cmp)
+LCRYPTO_ALIAS(X509_subject_name_cmp);
 
 int
 X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b)
 {
 	return (X509_NAME_cmp(a->crl->issuer, b->crl->issuer));
 }
-LCRYPTO_ALIAS(X509_CRL_cmp)
+LCRYPTO_ALIAS(X509_CRL_cmp);
 
 #ifndef OPENSSL_NO_SHA
 int
@@ -150,7 +150,7 @@ X509_CRL_match(const X509_CRL *a, const X509_CRL *b)
 {
 	return memcmp(a->hash, b->hash, X509_CRL_HASH_LEN);
 }
-LCRYPTO_ALIAS(X509_CRL_match)
+LCRYPTO_ALIAS(X509_CRL_match);
 #endif
 
 X509_NAME *
@@ -158,14 +158,14 @@ X509_get_issuer_name(const X509 *a)
 {
 	return (a->cert_info->issuer);
 }
-LCRYPTO_ALIAS(X509_get_issuer_name)
+LCRYPTO_ALIAS(X509_get_issuer_name);
 
 unsigned long
 X509_issuer_name_hash(X509 *x)
 {
 	return (X509_NAME_hash(x->cert_info->issuer));
 }
-LCRYPTO_ALIAS(X509_issuer_name_hash)
+LCRYPTO_ALIAS(X509_issuer_name_hash);
 
 #ifndef OPENSSL_NO_MD5
 unsigned long
@@ -173,7 +173,7 @@ X509_issuer_name_hash_old(X509 *x)
 {
 	return (X509_NAME_hash_old(x->cert_info->issuer));
 }
-LCRYPTO_ALIAS(X509_issuer_name_hash_old)
+LCRYPTO_ALIAS(X509_issuer_name_hash_old);
 #endif
 
 X509_NAME *
@@ -181,28 +181,28 @@ X509_get_subject_name(const X509 *a)
 {
 	return (a->cert_info->subject);
 }
-LCRYPTO_ALIAS(X509_get_subject_name)
+LCRYPTO_ALIAS(X509_get_subject_name);
 
 ASN1_INTEGER *
 X509_get_serialNumber(X509 *a)
 {
 	return (a->cert_info->serialNumber);
 }
-LCRYPTO_ALIAS(X509_get_serialNumber)
+LCRYPTO_ALIAS(X509_get_serialNumber);
 
 const ASN1_INTEGER *
 X509_get0_serialNumber(const X509 *a)
 {
 	return (a->cert_info->serialNumber);
 }
-LCRYPTO_ALIAS(X509_get0_serialNumber)
+LCRYPTO_ALIAS(X509_get0_serialNumber);
 
 unsigned long
 X509_subject_name_hash(X509 *x)
 {
 	return (X509_NAME_hash(x->cert_info->subject));
 }
-LCRYPTO_ALIAS(X509_subject_name_hash)
+LCRYPTO_ALIAS(X509_subject_name_hash);
 
 #ifndef OPENSSL_NO_MD5
 unsigned long
@@ -210,7 +210,7 @@ X509_subject_name_hash_old(X509 *x)
 {
 	return (X509_NAME_hash_old(x->cert_info->subject));
 }
-LCRYPTO_ALIAS(X509_subject_name_hash_old)
+LCRYPTO_ALIAS(X509_subject_name_hash_old);
 #endif
 
 #ifndef OPENSSL_NO_SHA
@@ -232,7 +232,7 @@ X509_cmp(const X509 *a, const X509 *b)
 
 	return memcmp(a->hash, b->hash, X509_CERT_HASH_LEN);
 }
-LCRYPTO_ALIAS(X509_cmp)
+LCRYPTO_ALIAS(X509_cmp);
 #endif
 
 int
@@ -256,7 +256,7 @@ X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b)
 		return ret;
 	return memcmp(a->canon_enc, b->canon_enc, a->canon_enclen);
 }
-LCRYPTO_ALIAS(X509_NAME_cmp)
+LCRYPTO_ALIAS(X509_NAME_cmp);
 
 unsigned long
 X509_NAME_hash(X509_NAME *x)
@@ -275,7 +275,7 @@ X509_NAME_hash(X509_NAME *x)
 	    0xffffffffL;
 	return (ret);
 }
-LCRYPTO_ALIAS(X509_NAME_hash)
+LCRYPTO_ALIAS(X509_NAME_hash);
 
 
 #ifndef OPENSSL_NO_MD5
@@ -304,7 +304,7 @@ X509_NAME_hash_old(X509_NAME *x)
 
 	return (ret);
 }
-LCRYPTO_ALIAS(X509_NAME_hash_old)
+LCRYPTO_ALIAS(X509_NAME_hash_old);
 #endif
 
 /* Search a stack of X509 for a match */
@@ -330,7 +330,7 @@ X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
 	}
 	return (NULL);
 }
-LCRYPTO_ALIAS(X509_find_by_issuer_and_serial)
+LCRYPTO_ALIAS(X509_find_by_issuer_and_serial);
 
 X509 *
 X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name)
@@ -345,7 +345,7 @@ X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name)
 	}
 	return (NULL);
 }
-LCRYPTO_ALIAS(X509_find_by_subject)
+LCRYPTO_ALIAS(X509_find_by_subject);
 
 EVP_PKEY *
 X509_get_pubkey(X509 *x)
@@ -354,7 +354,7 @@ X509_get_pubkey(X509 *x)
 		return (NULL);
 	return (X509_PUBKEY_get(x->cert_info->key));
 }
-LCRYPTO_ALIAS(X509_get_pubkey)
+LCRYPTO_ALIAS(X509_get_pubkey);
 
 EVP_PKEY *
 X509_get0_pubkey(const X509 *x)
@@ -363,7 +363,7 @@ X509_get0_pubkey(const X509 *x)
 		return (NULL);
 	return (X509_PUBKEY_get0(x->cert_info->key));
 }
-LCRYPTO_ALIAS(X509_get0_pubkey)
+LCRYPTO_ALIAS(X509_get0_pubkey);
 
 ASN1_BIT_STRING *
 X509_get0_pubkey_bitstr(const X509 *x)
@@ -372,7 +372,7 @@ X509_get0_pubkey_bitstr(const X509 *x)
 		return NULL;
 	return x->cert_info->key->public_key;
 }
-LCRYPTO_ALIAS(X509_get0_pubkey_bitstr)
+LCRYPTO_ALIAS(X509_get0_pubkey_bitstr);
 
 int
 X509_check_private_key(const X509 *x, const EVP_PKEY *k)
@@ -403,7 +403,7 @@ X509_check_private_key(const X509 *x, const EVP_PKEY *k)
 		return 1;
 	return 0;
 }
-LCRYPTO_ALIAS(X509_check_private_key)
+LCRYPTO_ALIAS(X509_check_private_key);
 
 /*
  * Not strictly speaking an "up_ref" as a STACK doesn't have a reference
@@ -422,4 +422,4 @@ X509_chain_up_ref(STACK_OF(X509) *chain)
 
 	return ret;
 }
-LCRYPTO_ALIAS(X509_chain_up_ref)
+LCRYPTO_ALIAS(X509_chain_up_ref);
-- 
cgit v1.2.3-55-g6feb