From patchwork Sat Dec 30 12:00:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jouke Witteveen X-Patchwork-Id: 1882372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=t8pD0qLw; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=lB3NorxY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5LPy4wtTz23dM for ; Thu, 4 Jan 2024 20:09:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=PC3eNTYzbeohxQrnO72tniHDPWnql/VOYPX55Y1OUEg=; b=t8pD0qLw5L+7FqFkR1zyJwAsNF D+4hsF1JrIY6eTc1NMUXOuCI42CcMviAG9yNTu7yhhKLelFoyaWhGBtKzRUQtkrrXMpGAteAtvxHs gYlbXX5k+WuSkTsczPPkCNko27l1mAve3YTAZ5buCGygvsiryzC7Y0kekkyyewkOFKO0WvT3Gyu+t MH1YO4s2JUL7O2X0xZwhTm9buKbvrRNtjpXrvIW+D1EEUf97wjsQCI1PwEHN7ILcziNjz4PSULjvi CGkjb+Nn7nSF5jDdPxYUS15kxuscjuslLXttttEyEMjGGMgxmBQHzFtcgNR91YkbnCcBpK5JGqH4g K3ZwWL+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rLJiX-00DJap-2U; Thu, 04 Jan 2024 09:08:45 +0000 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rJY0n-002jpQ-2n for hostap@lists.infradead.org; Sat, 30 Dec 2023 12:00:19 +0000 Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-427941528d8so59656901cf.2 for ; Sat, 30 Dec 2023 04:00:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703937616; x=1704542416; darn=lists.infradead.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=4U7i/quhh+eIDhF+MYsdS7VgwtCb4HGywQcT+/eOQQI=; b=lB3NorxYUGZNlNWE0OPeHaO1ZAbzpD1L/uMxQzlfS3tVVz4sSyGhqvWjIj9zplO1Dd Y29p1lv+D0a0EeuH9eantwWhtBa6kDywShYkLKCdNZL3SvvpgsycJabixE9yt4UBtf1M +xuU0YTnzGLONiNVBxshzZqohG+Ss7ObNh+hubOwd8UNiHf4bfC4vE9sDwJ9fu1TQQ+1 Ca0N/FZE+EwRTKgWHvxVbgUa2VhBXswcZgKgGEoiPiuknd2gGCPKDVo/Llvz1N/wzLAS 8j++sc8dN6nzjfVYYOQ5WuiqwlfapK6JCBRDWuPBKSbgtYRZN3le19M53eEie5kKYmiB m07Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703937616; x=1704542416; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4U7i/quhh+eIDhF+MYsdS7VgwtCb4HGywQcT+/eOQQI=; b=iUEPq/zUTwTwBPSJo9rzDsqoHILVVAPw/AHJjSGA2tq3MV/n/NHOQyeKKmKGrhbgRK B9KGg2MEg8aOjDOuTacAOvj1G54DkomuNAOUItODF3/2kGQnMek9fdNShO9cLgceq4vx O7bBRNZX03AaH+mOpMwcC24/9Qp/3dQnE4nlUgU61MrpOZE2Mcp6dUaF0k6+Dwr8G1of JXeS4ebpqZUoTkh80BJ4JlzPm+dp5vwCVsDVMyMoi/FoqhgSY+6zvHE4lzfV7/PhSHVK AVwWPxkWTYkvoZFGvTruj6BiwjD+4yf/1RV5zOEa5j2lAwxstGpWOD8gY/zzHmXK7D96 jhUg== X-Gm-Message-State: AOJu0YzYbTN7XYzXQemrmJU5hKRN2gPprgFCQjw8lgkiWTa+kKP21+BA 3o2ohZ6Dno7K/ArZHAEddtlQ88ycmv0886ZuYh1lDZnTgjfKgw== X-Google-Smtp-Source: AGHT+IGGDT3JS8FCY5tc5z0JSkcZnxKSAKBiGoyAGR3zxA2h348wIkYBxm0dl8nI9rRBR4ylCNGTmpGNknTg43KwnbI= X-Received: by 2002:ac8:5d88:0:b0:423:b62b:9e6a with SMTP id d8-20020ac85d88000000b00423b62b9e6amr17902366qtx.62.1703937615993; Sat, 30 Dec 2023 04:00:15 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Jouke Witteveen Date: Sat, 30 Dec 2023 13:00:08 +0100 Message-ID: Subject: [PATCH v2] Fix building against OpenSSL 3 To: hostap@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231230_040017_906782_230CD915 X-CRM114-Status: GOOD ( 10.80 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Smartcart support uses the ENGINE API of OpenSSL, which has been deprecated as of OpenSSL 3. Rather than migrating the code to the new API or pretending that we do not support OpenSSL 3, accept that w [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:830 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [j.witteveen[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-Mailman-Approved-At: Thu, 04 Jan 2024 01:08:44 -0800 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Smartcart support uses the ENGINE API of OpenSSL, which has been deprecated as of OpenSSL 3. Rather than migrating the code to the new API or pretending that we do not support OpenSSL 3, accept that we use deprecated functionality. Signed-off-by: line added to the end of the commit message as described --- The `#pragma GCC diagnostic` alternative proposed by Benjamin Berg would require a push at the beginning of the file and a pop at the end. src/crypto/tls_openssl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 5aff0d161..17283f998 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -19,14 +19,16 @@ #endif #endif +#ifndef OPENSSL_NO_ENGINE +/* OpenSSL 3.0 has moved away from the engine API */ +#define OPENSSL_SUPPRESS_DEPRECATED +#include +#endif /* OPENSSL_NO_ENGINE */ #include #include #include #include #include -#ifndef OPENSSL_NO_ENGINE -#include -#endif /* OPENSSL_NO_ENGINE */ #if OPENSSL_VERSION_NUMBER >= 0x30000000L #include #include