From patchwork Tue Jan 9 19:26:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: amy.fong.3142@gmail.com X-Patchwork-Id: 1884609 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; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=ebV3RdVW; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=jP9M8fr2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::33b; helo=mail-ot1-x33b.google.com; envelope-from=swupdate+bncbdu4fe6qrmgrbl5462wamgqe5wadtvq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-ot1-x33b.google.com (mail-ot1-x33b.google.com [IPv6:2607:f8b0:4864:20::33b]) (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 4T8gtr0LGpz1yP3 for ; Wed, 10 Jan 2024 06:27:46 +1100 (AEDT) Received: by mail-ot1-x33b.google.com with SMTP id 46e09a7af769-6dde0d9a04bsf1617326a34.1 for ; Tue, 09 Jan 2024 11:27:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704828464; cv=pass; d=google.com; s=arc-20160816; b=Lp0Cqf4pPhrSF4c/0TUlodGB0pz1xQMEpLvufRLpX+ljEHfyzsV9h+2cs4fLziif/7 hDIexdcu+Qbt46FMORydTQA+HBoT3kraOdA8s1pITrGH8vYdKhuzBX+WkpAS26ieHoe3 ciVGwpHbT9PlhCou+XlNz6t4f3SXG7VlrRYHprh2dzCZVsSDEJI+4DVsMkuXa/CnofHu PJfKSGoviWkrLz7e2HGYfqs0Hiu1VpSx556DeMs1IbOKw9ilU41M3EQn4tqbkQ6MIWcI yZnhOzS7yPUjAkpJjqt5D0zADJEHkISHJ6RKj+pi9MOm7+lw7308DLw/KCtGRElMclDP YMaw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:reply-to:message-id :date:subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=5nf0Su/IIUlh81qYbEE5nyT54e5ej7cr7HYCdCU44aQ=; fh=tUC4qYxnJeA7+O+/WQCoFUmd+pUfHX4EpA/OX8BQcSU=; b=mxVhCC5w/B/1XRMDUVx1pXDOxvtniFcErGzDYfPasRB1czGJu71jF1VGTbzJRmeuEO 5WMUQMpc/av9c0+Yn43UcsuUbbQ84N8urEG/k4yq1MZkHZ6bY/YteH8Cf/MpQc+ezuwp atItSCnJ5eyMlYyi1bifWGYYuk2drzqL/40jeXeD2ag2eO8GwNyyK65KXU3sabsAEALO GJGjxut48mTtamch93RS9IIbzPvvKMB8ObUUXSRDwqavGI/ZblR4Gq2WzxkFZN9VmjdA 8tMAHUB0frjkcsn/fKJjU39gXRuA3mWhnrVI2KKmlzfLofr9XftI9orEWkLVFsls45RA 0GzQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eTr0ySki; spf=pass (google.com: domain of amy.fong.3142@gmail.com designates 2607:f8b0:4864:20::634 as permitted sender) smtp.mailfrom=amy.fong.3142@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704828464; x=1705433264; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:reply-to:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=5nf0Su/IIUlh81qYbEE5nyT54e5ej7cr7HYCdCU44aQ=; b=ebV3RdVW6pCLdBmh9StMW3QJNXjvXD2ooAQHIPqdjBXuj2AWqwPXzpsLOB33CkdWGr HnhM+uKM8bpMzaWW0WFbwPHWIPup7S3nEGsVFUrm+nzt4Zj41sWLqoyLK/gLF5C1fxMp qely0EYpDoBZXyDiliQhsck1nrp6eSl7d5IumMZOIGi3PB057Z8E3VB8Da+Ci3zJGYtZ NGkiRMjMVa/s+ptyn6fyeHoZgDs6iwDN1LjJFuaoXSYXzpvJGLYhMbFGkUM9Nb+z3COY kWcg0o8Pj2UzGDpezeReyYoG00RZ6FEpatmrwOll21pqGnj7Z0rRAnoaPkC1jWCQrN+1 9j+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704828464; x=1705433264; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:reply-to:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5nf0Su/IIUlh81qYbEE5nyT54e5ej7cr7HYCdCU44aQ=; b=jP9M8fr2fBjJk92yqQ7pZxwhsM4xPGpyeRZOxbWX6vg4daw3Yxd1lmpZ69kswLDSpA 3nrD2c0wE34b2zYBRtrYEVOVUJpWopfKasOKXX8Ojw/vkUkYvITvyZoesDvxxVvoN1tX gVTGfzPFuW9uH5EWdu6jG6Fnm46Y3McmME+ghM9jQh6S397o1KatTGYUiCSqWxQoYQkk pa4rl2aMtyopuavQ+vysBPRChDwzrOfAWYq4bbR0hpOhhxj1L0npoQURLUzlQ+UvDjvC QzPgl/JmCIFL8EEsX+wglYvpPD9nVHILbq5pIhtDUD2YJU5w2lkq8VbDEdcFUtlG0NRe kWDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704828464; x=1705433264; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :reply-to:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=5nf0Su/IIUlh81qYbEE5nyT54e5ej7cr7HYCdCU44aQ=; b=caMPK7BUyB4JP8ZpuGXoKejAKa8b8oLQ4r/APZgW/lQW09d0FxNZNOFzuN7PDd/cKS 3jFQhSyx+ZwCiV93kxublPiEafNGlz9I/rYSQf5mrf+FlR/EwPOJrYBsOcZhwvTBgjT2 x9R0jhENDXoMhfFSOn4Xfy77f6pLAf3u5Se4auDP4FoBRwgFSJDoC6tRw4mFblPX8LCI KtwsPLWM8smgvO0Oood0XfoqHEJQkBY62wWPy/4rk6+gzNee/04mqVngdMF86LW47v1w GPop6PEQOjGGRavooh5kpI8fdz7GLSBxgs2cpSPQAKIU/BHsmkCVSo14BTi1QJONMGcv 3pMg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YyGW8cwgVk0KdvZMQebQWCLouOWVeiXzUJcSExX2aH/+LmXW/PG 1yLYlledwHH3l1LXyB4epY4= X-Google-Smtp-Source: AGHT+IEJ5uYwRuaD+H0kkjvWPiME+bFjnU4B2imrXxY/sNJeJlkvxZulKLOBUf/vodR90ou0f8K9sA== X-Received: by 2002:a05:6830:16cc:b0:6dd:bf5e:b59c with SMTP id l12-20020a05683016cc00b006ddbf5eb59cmr4653814otr.21.1704828463825; Tue, 09 Jan 2024 11:27:43 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6820:1ca4:b0:598:8e19:b9e3 with SMTP id ct36-20020a0568201ca400b005988e19b9e3ls449141oob.1.-pod-prod-05-us; Tue, 09 Jan 2024 11:27:42 -0800 (PST) X-Received: by 2002:a05:6820:162a:b0:591:3df8:53ce with SMTP id bb42-20020a056820162a00b005913df853cemr5017540oob.14.1704828462672; Tue, 09 Jan 2024 11:27:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704828462; cv=none; d=google.com; s=arc-20160816; b=Ck3AGQVrNX0AGwsLc1xWNl3TzfV1h7XmLJYTTSeOdsXguXLdRU3tz6raxbrtm4HviG CCIcj+MyUVS9PpJNoQ4wHY7L+Anc1uf17rEUz1GCvJDupgp2jcB/hm90D/MY1MZm6ARb gZuvy1kQT71dLYaLUDAMGqYBFkysCn/47bU70kE6LSXWWbh7ua8nMzGxMrYIPvarDre8 zXZrRk0GjyB63+nryyS7QHJ0nA/J0PBK6HM9wBaCJ2DCkd3LXF6NqVtJPxKV6vIc2034 4Ab1vZ82Tr3+3mU3o6VtPB5/pZv23saDrj5abAxOdSOigY9j41n3aQOPJD9MCr4DjmS8 8YBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=8SPlzHElzf3C2NlpW6kepknIcGaFrZo/viZm6dWCOp0=; fh=tUC4qYxnJeA7+O+/WQCoFUmd+pUfHX4EpA/OX8BQcSU=; b=DKDsL+7hCy2aYMKIAv066TEgPATBbCPgZQKWHbbSSn8UIBEbPzaTUn+ufIjU68GG7U Ur6v4aX/OSGCMTMTHq9gFWi+xJskEZSnGDbH5CM0Y1d6HldSj007gI5HI/KtH2rO3RDM 8hbjVUfNkxoeVoWeQ+63ihSe8uTrvF2QfsMDFXsmzH0Ja7T3W1FwKXDOU8C2BA1xR+IY g+G4/HX7mfINREZoXjjhO0/H1jw3Jzxn3vEmjlhgeUcoLenHsidtNPf3wXXw9/nceJdY oOZsm//r/ONZRheGZFllFR4ueM45VsrCMVB8yUAzPCYN4oJH7BH6hu7YqVmJ2lxglL7m mF/A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eTr0ySki; spf=pass (google.com: domain of amy.fong.3142@gmail.com designates 2607:f8b0:4864:20::634 as permitted sender) smtp.mailfrom=amy.fong.3142@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com. [2607:f8b0:4864:20::634]) by gmr-mx.google.com with ESMTPS id j6-20020a4aa646000000b005986978bd13si195528oom.2.2024.01.09.11.27.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jan 2024 11:27:42 -0800 (PST) Received-SPF: pass (google.com: domain of amy.fong.3142@gmail.com designates 2607:f8b0:4864:20::634 as permitted sender) client-ip=2607:f8b0:4864:20::634; Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1d4a2526a7eso17050995ad.3 for ; Tue, 09 Jan 2024 11:27:42 -0800 (PST) X-Received: by 2002:a17:902:9a4c:b0:1d0:71fc:b3ae with SMTP id x12-20020a1709029a4c00b001d071fcb3aemr2874302plv.29.1704828461517; Tue, 09 Jan 2024 11:27:41 -0800 (PST) Received: from cat.world.mentorg.com (nat-wv.mentorg.com. [192.94.38.34]) by smtp.gmail.com with ESMTPSA id iw17-20020a170903045100b001d3c3d486bfsm2145130plb.163.2024.01.09.11.27.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 11:27:41 -0800 (PST) From: amy.fong.3142@gmail.com To: swupdate@googlegroups.com Cc: Amy Fong Subject: [swupdate] [PATCH] gpg: fix broken build Date: Tue, 9 Jan 2024 14:26:48 -0500 Message-Id: <20240109192647.1148715-1-amy.fong@siemens.com> X-Mailer: git-send-email 2.39.2 Reply-To: amy.fong@siemens.com MIME-Version: 1.0 X-Original-Sender: amy.fong.3142@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eTr0ySki; spf=pass (google.com: domain of amy.fong.3142@gmail.com designates 2607:f8b0:4864:20::634 as permitted sender) smtp.mailfrom=amy.fong.3142@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Amy Fong Fix syntax error in conditionally enabled definitions. Signed-off-by: Amy Fong --- include/sslapi.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/sslapi.h b/include/sslapi.h index 0dce615..83efd9f 100644 --- a/include/sslapi.h +++ b/include/sslapi.h @@ -108,6 +108,11 @@ struct swupdate_digest { #else EVP_CIPHER_CTX *ctxdec; #endif +#ifdef CONFIG_SIGALG_GPG + char *gpg_home_directory; + int verbose; + char *gpgme_protocol; +#endif }; #if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -159,7 +164,7 @@ struct swupdate_digest { #endif /* CONFIG_PKCS11 */ #ifdef CONFIG_SIGALG_GPG char *gpg_home_directory; - int verbose + int verbose; char *gpgme_protocol; #endif };