From nobody Mon Nov 09 05:41:15 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 4jNJYR4frwz6xhh6 for ; Mon, 09 Nov 2026 05:41:15 +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 4jNJYR3kjyz4HY3 for ; Mon, 09 Nov 2026 05:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794202875; 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=qOnkniybUC7NB++mjGKcCQETK51Xd3n2XRHgw9JPnaE=; b=emCbeCzoTbvNYyFjh1rhZUFx/FxpKlLbOdtyquR9Ivjbr712Qkeqts9pYolnBQ6GD0gysP izNThcU8iTaROFsVR+WvE+iImGcN798TDxhRrl+snTXrJjE7sAGGSDdZZAp4noGGlUuDhV C0fyEIlGXDpJ86GWKRIdCqx+vCz8uQI9S0SmIPA1K2QthsGrgFnV/Cz++oSobUWCCuOkfa W55X2rbrj7sND1//V4JDbr2zdUdheXA5MzK7YNcIptn6d+xQzSP+NnyelprC+y4Vh+q4LY C/Jp/K8A0gi/+ZW99twXoxc+ymZmJsUebydwABYsSVQ5N0oxjkVCd5QE5JdUOA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794202875; b=SOYQ8b66JkWd8f2m0WcsH+cFFw3jQt+100/aHzFDeyep+G2OrwOu2tqnTRZ4I43+uYO4Uf 58EE/cNLO57JqZvX4GpaVI5AH+nGA7tjAqNMK7QrVtCvuib207I9UwGYHmW92gvto3UOIY FppTnw6XF/cW/HD6PMlSiFEDRf26v9qpw2eMLnZjm8egkoRzOE8j1jkfa+dY2KvF4wKbSb hDjSyyYHOMmSBJwam7A+x7oYWJ8kBgVKciA3ilw+gqVtzMr2W8/2RRrT2oBcGJRUin3WCq yAPR8wkYj6nhhT2dioJzE3GuQnCGu/OLhymB7i78c2wxzXs0p0YN+C+3hzSKzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794202875; 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=qOnkniybUC7NB++mjGKcCQETK51Xd3n2XRHgw9JPnaE=; b=kEzbNYbxk/ukEsnV//hb4aC/ZSyrVs1AHsQ0FhuE8ahu9BZvlm1dN9+WsXn7Q1Uj/hlMsx HZ33J6Rfj63XzK4TSf8fySBWzYzAlJwdNAgbSHFXzMo4mA8qJfYPCANfGUBMCuWUGRS2ab RRRHBxHO045u/VDy6sjQEW7Fe3is3ZGVVMHlRCyyvr7awxHN1FrDrNJqpzZWtxmEHCcOCZ kHEvHIVw6gon2pIEPfi/qNsmcGX+zAFmyfrLixskiSh+6jc6lAwbabpWCG9Pm8wTAQEAas QYug044SIYAlWnrEcnRYxF1H6vVZsYilnGIp3jtaiDN2/lojoW4jM2/FKybxqQ== 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 4jNJYR35NGzQ0G for ; Mon, 09 Nov 2026 05:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 05:41:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Tetlow Subject: git: 56741ec70e54 - main - 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 Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 56741ec70e548d9360982e3d7c48c0c6946bc16e Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 05:41:15 +0000 Message-Id: <6af15cfb.1fe85.6508d097@gitrepo.freebsd.org> The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=56741ec70e548d9360982e3d7c48c0c6946bc16e commit 56741ec70e548d9360982e3d7c48c0c6946bc16e Author: Gordon Tetlow AuthorDate: 2026-11-09 05:35:10 +0000 Commit: Gordon Tetlow CommitDate: 2026-11-09 05:40:41 +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 MFC after: 1 week MFC to: stable/15 Event: FreeBSD Vendor Summit 2026 Differential Revision: https://reviews.freebsd.org/D61271 --- 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