From nobody Mon Nov 16 06:33:21 2026 X-Original-To: dev-commits-src-all@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 4jSdNL2VkRz71HwT for ; Mon, 16 Nov 2026 06:33:22 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSdNK6HVjz3NTk for ; Mon, 16 Nov 2026 06:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794810801; 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=3EB3ahgmtKoUyqhGg7cbALyTRER2LHeaEbCI75z7cg4=; b=NEcw21Eu2q7Pw6m8+TaaHd5kkJ+cp/ml1spNVd+OfGcU+++7In72fMhLaskrPLSVgnS4pT zmgGlMMOuQq4o3+Dqby4qjLj/qY7nznkrzfe2KC7gUjW/LxOhMTES51oetOuZiqjIbVmSK HQw4Z0ZODlpb4DR5XcOal1CAAvIuAwq2UDIDlTR/OV1nMURbAw11QaUjFsAJs//djQb46Z h6cyzP+J+zaVP9566GDnUo+/Cb5fjGLxUFH8Ylx1Zehby9rIDMbuRm1fS9VvsL5d6gUABf wdaN3f1dfUdhZQANcLIsfwqJRmGz/RE/tugToznoLNuzP4YGBmAbSMdohRcn2w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794810801; b=q76p0bCwl+PKq1FCp+8vvCiERA2YVm1RfvDeA2TVMBEjW0yn4PEawtQuJQVaUvaT02JJrp Okj6yTS09dNnoFEoi5quqEFbh0iJw5JQMuzenkcI9+hJC2Q+yd1aJu5cCbjNyc+Ae0FXVF sqLNXnXvlvtSsoYClJwwhWRSJZ3NzemaZNrhfp4ZX0K+s3Teg7oSDD9uY0MlOfw0htoY5z rDbJyFhoZJRb+sleGo5F3yD+MDxlxOiMYZZf9QpUEaYyQgeqcU/Y5OldNA7VDdwQ/Pzur+ GetlTOSDfDZNc4Mh1za/6rBdgE+MNQuOj/Mq7zHq5i0l6Y9h1NNbBZk/yhDdZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794810801; 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=3EB3ahgmtKoUyqhGg7cbALyTRER2LHeaEbCI75z7cg4=; b=MsZ3yH2b3492PWVMuJzO3waW+VjwuDpidQWgQkfXr5DhHgKWhtqU0W6IaMHvD+ycYTF/xv Wexdb1N8No/utGN6GM8olIfovHw87qk0cAUOipMk+Eg6eDZmrbQLNQpTGkCuTt398t6LPr 44Hn7Tgdi0czi0uF6P7wglBINKPw8wbO5ApHo3Cq2WSZDhfEAA9PnHEdJyeeydXungDljQ OXDLJk7mIAAXCUMO8Ynu1I7LjCkAohHotREdatE51J+6plD1xgZ5C2S2swRKyEkgMQJweh O+7qiFl90cYphxttvBUsIWaVIGTkEHdrvpcJgDYVbnLSHbAS5iDnkSpVm7CRwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSdNK5fLkzjjk for ; Mon, 16 Nov 2026 06:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 15e0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 06:33:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: a618be80fee9 - stable/15 - openssl: fix engine defines to match upstream List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a618be80fee9cb48f12faf85c269f59fa12d35f2 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 06:33:21 +0000 Message-Id: <6afaa3b1.15e0c.216dd07c@gitrepo.freebsd.org> The branch stable/15 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=a618be80fee9cb48f12faf85c269f59fa12d35f2 commit a618be80fee9cb48f12faf85c269f59fa12d35f2 Author: Gordon Tetlow AuthorDate: 2026-11-09 05:35:10 +0000 Commit: Gordon Tetlow CommitDate: 2026-11-16 06:22:19 +0000 openssl: fix engine defines to match upstream Two engine Makefiles define different macros from upstream's engines/build.info: - padlock: engines/e_padlock.c builds the engine only when PADLOCK_ASM is defined. Upstream defines it on x86 and x86_64, but our Makefile never did, so padlock.so has been a stub whose bind_engine() returns 0 and the e_padlock-x86*.S code it links was never called. Define PADLOCK_ASM on amd64 and i386, where that asm is built. - loader_attic: upstream defines OPENSSL_NO_PROVIDER_CODE; the Makefile had OPENSSL_NO_PROVIDER_CORE. No source tests either name, so the build does not change; this only follows upstream. Found by comparing per-file compile flags against an upstream 3.5.9 build. Checked by preprocessing e_padlock.c for amd64 and i386: COMPILE_PADLOCKENG is now defined. Reviewed by: ngie Event: FreeBSD Vendor Summit 2026 Differential Revision: https://reviews.freebsd.org/D61271 (cherry picked from commit 56741ec70e548d9360982e3d7c48c0c6946bc16e) --- secure/lib/libcrypto/engines/loader_attic/Makefile | 2 +- secure/lib/libcrypto/engines/padlock/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/secure/lib/libcrypto/engines/loader_attic/Makefile b/secure/lib/libcrypto/engines/loader_attic/Makefile index cee699eaccf6..a5fac66a8651 100644 --- a/secure/lib/libcrypto/engines/loader_attic/Makefile +++ b/secure/lib/libcrypto/engines/loader_attic/Makefile @@ -2,7 +2,7 @@ SHLIB_NAME?= loader_attic.so SRCS= e_loader_attic.c pvkfmt.c -CFLAGS+= -DOPENSSL_NO_PROVIDER_CORE +CFLAGS+= -DOPENSSL_NO_PROVIDER_CODE LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libcrypto/engines/padlock/Makefile b/secure/lib/libcrypto/engines/padlock/Makefile index 60dfa9c77c20..e904387732d8 100644 --- a/secure/lib/libcrypto/engines/padlock/Makefile +++ b/secure/lib/libcrypto/engines/padlock/Makefile @@ -3,8 +3,10 @@ SHLIB_NAME?= padlock.so SRCS= e_padlock.c .if ${MACHINE_CPUARCH} == "amd64" SRCS+= e_padlock-x86_64.S +CFLAGS+= -DPADLOCK_ASM .elif ${MACHINE_CPUARCH} == "i386" SRCS+= e_padlock-x86.S +CFLAGS+= -DPADLOCK_ASM .endif LDFLAGS.bfd+= -Wl,-znoexecstack