From patchwork Wed Sep 14 07:00:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fend X-Patchwork-Id: 17366 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C7E3EC0DA4 for ; Wed, 14 Sep 2022 07:00:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C38CE61FA1; Wed, 14 Sep 2022 09:00:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1663138836; bh=9p2AUpiSqQUs6O2QSnxCgkEPo1n2mzVG7iW0KvB8M6E=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wh9UHrnkaGi3UVlOxZ3xoSHQE4cYR5BJefifmPhc5W6ZcBdip4Yfw1ZlPjWmUdD6k KPI0VozqZTUoQ+2PhKHfuDH5ZjLw4yzo3D57e2l4xm+NHwzi1gpcxZEYyJvGTFIlVL QA3oGhSYT1deQXju4nOzIYPceS5F9y2a/fEz8c+KDq7IBL5vErN6syr8hrFsEHOavG QHjOAsoO63Rb8UutauYEzCgvzYktM9dhNuossxibG8S6opxflQPLCQeY4QMbcspl8C b7rtDeP1JhzN8RqFQZwqQm6rFV53ZYwVZDabx6UcZfNvMjYcoaqAZbVxVWCIBR0Lyg Gac2EN8zmVAOw== Received: from lx20.hoststar.hosting (lx20.hoststar.hosting [168.119.41.54]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 752896099B for ; Wed, 14 Sep 2022 09:00:33 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=emfend.at header.i=@emfend.at header.b="efjnEhzm"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=emfend.at; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ckZBHS6qSHYpY5dE/B3GHXY9/t0HPXOYALJWwHvYm+I=; b=efjnEhzmYtcwbl8EqV8Lokshyp o32/bN9YIQWKCK1wqRqkcMBltUkBUo2e0GX+d19uEEsvvc6W3gNdCPsHvkS/q9HfkHhEW1pmqv/+c ui5qBH+dj44ngwKA5BzMVN5PBSPOjOl6n2/CrK02UN3ipGSTJY1EFhoCvlwVqWwmISpI=; Received: from 194-208-208-245.tele.net ([194.208.208.245]:57025 helo=localhost.localdomain) by lx20.hoststar.hosting with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1oYMNs-005qT1-HE for libcamera-devel@lists.libcamera.org; Wed, 14 Sep 2022 09:00:32 +0200 To: libcamera-devel@lists.libcamera.org Date: Wed, 14 Sep 2022 09:00:25 +0200 Message-Id: <20220914070025.27540-1-matthias.fend@emfend.at> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Score: X-Spam-Bar: X-Spam-Report: Subject: [libcamera-devel] [PATCH] libcamera: ipa_manager: Fix build without openssl X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Fend via libcamera-devel From: Matthias Fend Reply-To: Matthias Fend Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Since commit bedef55d9500 ("libcamera: pub_key: Gracefully handle failures to load public key'") the build will fail if openssl is not found on the host system. Use the existing HAVE_IPA_PUBKEY define to avoid accessing pubKey_ which does not exist when building without openssl. Signed-off-by: Matthias Fend Reviewed-by: Kieran Bingham Reviewed-by: Umang Jain --- src/libcamera/ipa_manager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 2f96a207..030ef43f 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -109,8 +109,10 @@ IPAManager::IPAManager() LOG(IPAManager, Fatal) << "Multiple IPAManager objects are not allowed"; +#if HAVE_IPA_PUBKEY if (!pubKey_.isValid()) LOG(IPAManager, Warning) << "Public key not valid"; +#endif unsigned int ipaCount = 0;