From nobody Tue Jan 20 19:43:38 2026 X-Original-To: dev-commits-src-branches@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 4dwd6g0LSSz6P3R4 for ; Tue, 20 Jan 2026 19:43:39 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwd6f6Hznz3syD for ; Tue, 20 Jan 2026 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQYssoxyzBScvUDePAuKi92ddXMBoQyf+gvfRjUtcB0=; b=UoGa4nkVqe8fD52LIGiFeAirnjoD5TIg33NPQ417qhEMJr8Cz0PUrnqr7c9Ub9DmROJvno K/qa/2FoIdoMX7RoUJb/PB0bWqBOdALYbxtVw1w/QcjD/1VqPFxHK9HyAbcWMDHnhLyKCw R7pv6YyVq2qbw4tFHFSRSOhwh7JMZo0nximGajvg/f/lx6KiudYFtslIoU+pBdmpBYZOcm 6XtBn2hW5sEPtx8giNDLRQlO1ah+K2fiJBgFMAnXeM4MOEfmnY8J3Gz2RQgzsYfyi7LdcX +MFwHCfzTYOJfd/C6t2N/3choOBE18UHWOuANhgLySaepNiKFOC7C2h3fYidEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQYssoxyzBScvUDePAuKi92ddXMBoQyf+gvfRjUtcB0=; b=A9EM1V5D+wOY/mn4uHwBnwrWMTcYg0BZ6OsW/acTuQSvkwx5GzGDO/9w5dRQOh2gzrwv58 1xJcTe0hDO5+uNlbDjyVyMrzpYISZtPH0uHbqfyYjf3HuUYhkznadOgrtgIS0BL1dgsubb LiRUR01oNqwzcjApxVAyl0oQhweMp1IctqPGuFkwzjHOuunZwaEygdQni4QoMoXY4aieTc wb1TqfwNlaZrPzFX8RPVkuMrtmBc2sk9y/lDb/cNH4g7n1ww3qFQTgQxqh1g2Y/FdTcAze qHBHHQErzeHMovPDNRdSV22D0u7hmzFIbsiiwKwqYz2QVuXLcWehWc8pqBCiDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768938218; a=rsa-sha256; cv=none; b=pb4Equ1UAMjDD/ygt1XtiqDMLPHd2yllhVfPC32cdOFpEoSGMJDO1Yh/v/XgPZUZd2MzAV jhmLHfSuko/ZC6OC7HB3/dmQWTYn/2BE4xDoueFKWemmuGPYvuyuO+yKWFkrqW5HXeEwc3 /VKzQWQppVicUTDZH+YImwAzMtHMtuAHohv/xfXHdzodelMduvt8VCZP7CdNtnuWhhI4te j0v+rvOvn+4DM542mZXRkBqRxMq2wD7ouGSwUW1uBfuoBCmC86AurC6zJXFcfil4O8STSP +0KR2XofRDjrsvGWSbLa3vqYiSh94tP2PIGjONaV/L4ka5xaL8B4dFX3ARO34A== 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 4dwd6f52pTz1Mk for ; Tue, 20 Jan 2026 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d889 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 19:43:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: 79041942fa9a - stable/14 - openssh: Don't include an unused EVP_CIPHER_CTX_get_iv() stub List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 79041942fa9a4496c11f437e323fb0fc767fcce5 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 19:43:38 +0000 Message-Id: <696fdaea.d889.5ea5c308@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79041942fa9a4496c11f437e323fb0fc767fcce5 commit 79041942fa9a4496c11f437e323fb0fc767fcce5 Author: John Baldwin AuthorDate: 2025-08-08 17:43:56 +0000 Commit: Ed Maste CommitDate: 2026-01-20 19:42:08 +0000 openssh: Don't include an unused EVP_CIPHER_CTX_get_iv() stub This stub isn't actually used on modern versions of OpenSSL for which OpenSSH uses EVP_CIPHER_CTX_get_updated_iv instead via a wrapper macro. However, the wrapper macro conflicted with the existing namespace macro triggering an error on GCC: In file included from crypto/openssh/sshd-session.c:65: crypto/openssh/openbsd-compat/openssl-compat.h:71:11: error: "EVP_CIPHER_CTX_get_iv" redefined [-Werror] 71 | # define EVP_CIPHER_CTX_get_iv EVP_CIPHER_CTX_get_updated_iv | ^~~~~~~~~~~~~~~~~~~~~ In file included from : crypto/openssh/ssh_namespace.h:12:9: note: this is the location of the previous definition 12 | #define EVP_CIPHER_CTX_get_iv Fssh_EVP_CIPHER_CTX_get_iv | ^~~~~~~~~~~~~~~~~~~~~ The error was masked on clang due to MIT krb5 adding a blanket -Wno-macro-redefined. Building sshd-session without Kerberos support was sufficient to trigger a warning from clang. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51810 (cherry picked from commit e8633bc76ad935fa44156034713c608477bc3da0) --- crypto/openssh/openbsd-compat/libressl-api-compat.c | 8 +++++--- crypto/openssh/ssh_namespace.h | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crypto/openssh/openbsd-compat/libressl-api-compat.c b/crypto/openssh/openbsd-compat/libressl-api-compat.c index 59be17397c56..2381df57ac2b 100644 --- a/crypto/openssh/openbsd-compat/libressl-api-compat.c +++ b/crypto/openssh/openbsd-compat/libressl-api-compat.c @@ -26,6 +26,7 @@ #include #ifndef HAVE_EVP_CIPHER_CTX_GET_IV +# ifndef HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV int EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len) { @@ -44,14 +45,15 @@ EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len) if (len != 0) { if (iv == NULL) return 0; -# ifdef HAVE_EVP_CIPHER_CTX_IV +# ifdef HAVE_EVP_CIPHER_CTX_IV memcpy(iv, EVP_CIPHER_CTX_iv(ctx), len); -# else +# else memcpy(iv, ctx->iv, len); -# endif /* HAVE_EVP_CIPHER_CTX_IV */ +# endif /* HAVE_EVP_CIPHER_CTX_IV */ } return 1; } +# endif /* HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV */ #endif /* HAVE_EVP_CIPHER_CTX_GET_IV */ #ifndef HAVE_EVP_CIPHER_CTX_SET_IV diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index 7a0c73f2d312..0fa812218c06 100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h @@ -9,7 +9,6 @@ #define Blowfish_initstate Fssh_Blowfish_initstate #define Blowfish_stream2word Fssh_Blowfish_stream2word #define Decode Fssh_Decode -#define EVP_CIPHER_CTX_get_iv Fssh_EVP_CIPHER_CTX_get_iv #define EVP_CIPHER_CTX_set_iv Fssh_EVP_CIPHER_CTX_set_iv #define Encode Fssh_Encode #define Hide Fssh_Hide