From nobody Sat Aug 2 05:32:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bvBK85ly1z63cSR; Sat, 02 Aug 2025 05:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bvBK76qPgz3DWH; Sat, 02 Aug 2025 05:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754112732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WiNrjptN+UElnBMAAJT6uoFwDYB5mIYwm9h93f7+g3c=; b=UxdA3nW84kd2fNt2qEE34O2hmD/VaD2x6seoM8clCsjCxGmJfzokH4ztT+dPgT5pGJm35c jbMLABSptxCmBaQeD6hoUyYjLFN9v/leLkrBLviJgeGhdZoUFWGZoAYAis0fbNELWRrIVL ofspUyEvECa+C0ypJn7FLHEAqMn9IDSQNGiPvZEckbG1TqEfw0I3tle31sHY4ZJaPIyQ87 FHnLwxScZ+PaICFyXW3oNoAJkXqjUdQcRCy8SfZvIWQY0VbQLo51ThV77WwqYcvJEC4yIR XY7B0/RHkDBBBKdE640eZ+c4cjyVBp2SD3f/fv2fPCRwTSdHEy4nrfiZubzhJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754112732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WiNrjptN+UElnBMAAJT6uoFwDYB5mIYwm9h93f7+g3c=; b=tebJFtyl9WAIbIVkehwTw8Lvq0VmpIFiUbhr4+N+Z13EkOXF8hIKS9AWs+3/VjF9NCutNZ qJaM5B2xUaXkK2wIf3ATO/VN7WwNiR6Ov8y7Wy5iqvaVQ2rR36UMqtbyuQTEtCCApaSYE+ x+XRxNsA7QZ5xrhDNls6azcnOizmclDqsBpSEz02mXls2Py+fxkYsMdsDvUC4TCWYLLJ91 wG+8Lt4IJB55MsN3++owYhZ8jjCte5WHojD5zSm+MIg1gFXW6rZGOZJavaZ0NF+0k+j0mO MUBjm/KFNzYTUOuvZGGV4DoiBOdewFY+gnpNqkRRg2Mw/sckJbOCKcIZxUQ3ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754112732; a=rsa-sha256; cv=none; b=b1t6Jyc9pvqIkOJmQDvc+h3S38eauCK+wRW/zskFLFawOwPlP0A8pTLQYwgjilly4yN9Bl 9G1gq3VF1qxfzJd0YSxgzeRa1sUA7WvQbD7TjIqtObsDtTwKhO7A9QZYdqWuFkyNPYfRQJ egR44078ilDiTUY/Sv3T/sH97iu9P+XtjrgDqW0p7Qi9BAwezNaLbmtv8xrtsLmzUWboUV v9BSRwzuraw3DB+6XuPhTsJuq6OCNAoAi2X30rqtJFENpJnai+eQuGbPLgYM+0/cZcXIga W/rThhJnCBtAHyY67Wrf3rNquMoHhLmk1fEHJY9acBSSw4qk2b7xtJs45yNmpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bvBK76Qyhz1KFQ; Sat, 02 Aug 2025 05:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5725WBux070242; Sat, 2 Aug 2025 05:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5725WB6a070239; Sat, 2 Aug 2025 05:32:11 GMT (envelope-from git) Date: Sat, 2 Aug 2025 05:32:11 GMT Message-Id: <202508020532.5725WB6a070239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: d1095367eb51 - main - krb5: Rename the ALIGN macro in aestab.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1095367eb5116a0b9a1b9fb6eb913a77eeb5e5d Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d1095367eb5116a0b9a1b9fb6eb913a77eeb5e5d commit d1095367eb5116a0b9a1b9fb6eb913a77eeb5e5d Author: Lexi Winter AuthorDate: 2025-08-02 05:25:02 +0000 Commit: Lexi Winter CommitDate: 2025-08-02 05:30:17 +0000 krb5: Rename the ALIGN macro in aestab.h This conflicts with ALIGN() from . Rather than trying to excise from all of krb5, rename the macro. Reviewed by: des (previous version), cy Differential Revision: https://reviews.freebsd.org/D51574 --- crypto/krb5/src/lib/crypto/builtin/aes/aestab.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h b/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h index 8fe32d1800d6..87d7097ba0ec 100644 --- a/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h +++ b/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h @@ -86,10 +86,11 @@ extern "C" { # define EXTERN extern #endif +/* Renamed from ALIGN in MIT source to avoid a conflict with machine/param.h */ #if defined(_MSC_VER) && defined(TABLE_ALIGN) -#define ALIGN __declspec(align(TABLE_ALIGN)) +#define AES_ALIGN __declspec(align(TABLE_ALIGN)) #else -#define ALIGN +#define AES_ALIGN #endif #if defined( __WATCOMC__ ) && ( __WATCOMC__ >= 1100 ) @@ -99,13 +100,13 @@ extern "C" { #endif #if defined(DO_TABLES) && defined(STATIC_TABLES) -#define d_1(t,n,b,e) EXTERN ALIGN CONST XP_DIR t n[256] = b(e) -#define d_4(t,n,b,e,f,g,h) EXTERN ALIGN CONST XP_DIR t n[4][256] = { b(e), b(f), b(g), b(h) } -EXTERN ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH] = rc_data(w0); +#define d_1(t,n,b,e) EXTERN AES_ALIGN CONST XP_DIR t n[256] = b(e) +#define d_4(t,n,b,e,f,g,h) EXTERN AES_ALIGN CONST XP_DIR t n[4][256] = { b(e), b(f), b(g), b(h) } +EXTERN AES_ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH] = rc_data(w0); #else -#define d_1(t,n,b,e) EXTERN ALIGN CONST XP_DIR t n[256] -#define d_4(t,n,b,e,f,g,h) EXTERN ALIGN CONST XP_DIR t n[4][256] -EXTERN ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH]; +#define d_1(t,n,b,e) EXTERN AES_ALIGN CONST XP_DIR t n[256] +#define d_4(t,n,b,e,f,g,h) EXTERN AES_ALIGN CONST XP_DIR t n[4][256] +EXTERN AES_ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH]; #endif #if defined( SBX_SET )