From patchwork Tue Jan 16 14:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 861621 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c09::239; helo=mail-wm0-x239.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbee27djakgqe3ttg3oq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="dPP1bUed"; dkim-atps=neutral Received: from mail-wm0-x239.google.com (mail-wm0-x239.google.com [IPv6:2a00:1450:400c:c09::239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXkY3PX7z9s7M for ; Wed, 17 Jan 2018 01:32:51 +1100 (AEDT) Received: by mail-wm0-x239.google.com with SMTP id r82sf2252317wme.0 for ; Tue, 16 Jan 2018 06:32:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1516113168; cv=pass; d=google.com; s=arc-20160816; b=BMJrfd1gCC+hE5Cih9FwoKTJ9DvRvT3Zk4IFbnvSOEksiZOI0+J6Ifd6V4ClgqwFT4 /qi1dFT7jUwYw5/WGT2pRSuf4Cto0CB3UxNxLIRyCPfulCxwZZlKEPpfReu8pEz6pI23 hJLOaPQB+QlMkNqDt+t3N2WhAWyTKOAqI93LNYTLTZHGZfnrgoWS9Pe3RcpxY7GDH917 lmcdyANSuTVDFmLdha+uXMMzp3RO+ONMVTEMHY4eSWadKNYkP4sJCvarhgjszAhd5Mzr Q7YeNFTPKLyYAQ2mG0KZAfwCQZOWKOuyD7ouEQSJX4gzfiZl4PcsLN06qZUt2irtDH9T waoQ== 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:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=hd37WjGixsTRI7EG4tz/A5wxV+WK5BL6qhOai9SDD/k=; b=L2x9p2xyanZl+FMUiVKaGSYR++ia/zhTqirAzN5/LLjNzp243PIgt773grWaGhNdnZ UbFjUl/ikdoDV+mGvNq+YuRt87tPVOvaJEdhH+4GKKLzB2auBODU5yQRChehbOhFOPPd b0smcfKWsymiZQ5epPTM3k5XJWOXdXml8A8sid6HzDqtbcnFfgFFiceNOutjgROae92T TWujcrYQ2gfguyyNfdUGQLdAVkGzJukT576NcQ0OONp/QlaqK/0HXCHOmghH5kx1b7TT n4h5DnZt02qf7dOfegpeRnIcOwY++n/0SyogPsbPGMzYY65ClwfobGp3Vl4kWPt17cJ1 PORw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=hd37WjGixsTRI7EG4tz/A5wxV+WK5BL6qhOai9SDD/k=; b=dPP1bUedVqSU/c7VUN6vIKAct8QzDnQra+Xan0f4X8lxbutbtIxr+pL61FtFEUixos I5Ef999tN0uwPXk2y3xRVBwzwhiqWTd/2CWk296MfiDs6NUGMjTJXDIbYSSydjB7JcC1 vLePhp0zC1J/FED4hmzBLhjeYbbtzvI6tHQ667VskNooLkK0972JORFh7i+e2W/AwCMT 4/lkdgAP3oKSsZIgIJn7Q2BLGxFQPLa004iRV6zBswIH0D57g13wClVzgxZy68o05vy9 nD+5HIiZ2o7G1nrdU5hHKuLItBnkEOaXnQz5oGHvjeALouComh+Lzm1FXXnR9PM3BpBF CSqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=hd37WjGixsTRI7EG4tz/A5wxV+WK5BL6qhOai9SDD/k=; b=ihuQ72lY7EIPWCnRp/U6OPEkx+vtdMT11KXoa0SUnLmPbcBarsNTSunUnmD3Wo0W33 xBWuWnjtrPnqPcoOoO12smuDPLDHCGulSOyxtZTGt0hQ6O8UvDi2A6sw4b1Y4EcS6zRQ p1nj+3VhlrFtr1I9DElNB0oj/cAKSssPFOM25Nd90H4bLETY5jD2VPGGWaZvyajKIhLk qQB0a2WsdWyqPiTlmBQbS4REcKQbo7Vq/28vPD+Qc2Hmb3Qv+CcAKvCnd88raKs0o9KX SRfo9L5eH4OF69YJsukGhdiCzrmXO6o42aNFNMQX0RRHeQTouXrmQ/+x9N2eCXFZrdt6 89jg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AKwxytf48pEtVAYsv+4b3kd58YoVvQgG1FJHNuO2Tmo7wx/O46eEmJ/Z usDj8aA5tmq/4HwjvwpI6Js= X-Google-Smtp-Source: ACJfBotMHpIwADZecnogKn4t8fSmdcqyoIZ21Hw5ZjTkHoCIJiKmou/2FGi7Wl3rFRfxfB7AvIOqNg== X-Received: by 10.28.138.213 with SMTP id m204mr104147wmd.5.1516113168536; Tue, 16 Jan 2018 06:32:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.28.122.1 with SMTP id v1ls781360wmc.3.gmail; Tue, 16 Jan 2018 06:32:47 -0800 (PST) X-Received: by 10.28.9.77 with SMTP id 74mr1827724wmj.24.1516113167979; Tue, 16 Jan 2018 06:32:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516113167; cv=none; d=google.com; s=arc-20160816; b=VSW/W2vCQlUseQdPIayhrPQfT4JMzU/LNUo9KabFcJqrv+l4ZURGrmfTtZd9wRVqp8 aiDR58+bBc8uGzrmKv70NoKi0OG8e5+RdPKAhejBtgXhaElPZGCTW9Agdx4s5uiAsrbf PKEkZjFCLfcS++aaaFhDCMrI9yZPGczaGdkbxXOZJlixQrWhNcdfgp4/6TpULvBBv4Ka RNwjcCNSkzCpvkVItJiYxi9lMksjHkv9NdnmOKSEX7IAWJxX/rlyyK05H8aS4lmYSNjz nBajP/GsLi2/9XbwlsNZ+3Uoe7HTrvguaz2qQkQgphmeU7bPKoecEeH56M+cn+A++CTB UObg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=8APIoab8BQZtDh+HZ+lc/f5RItSZeOsxUzzphqHGFGU=; b=weUDBZF70J6QVtMtlUBVE2OYXMrr0OLlVI1rVxg1XoanIMfY1FPO0AJrZySlg/FkgH F3+M/3f7IoSNK/Ifwvr1jrwz1Gj+fNkXCaZplaThcslkCCtpzyG+3rVzDAMktIxQEpXG KZvEpia5sTJYxyL3CNHy3aCgh2S5iODK/T8RreZRjbdmmrbzXVp9y5fCHYA9KryrTx2c 1yInGmFlM2H+GjMLZHRIbHue2dQk9XPy/BVAsV8k115+m5DIYAA5exrT8kkMF3KqFcpE tRJzM89/itrX5OQR3OLTmmEeahPjP/rRytfRXFbNFWvHh+YpcZR98V/vU5Un2kwu0scp 5mvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id s81si311630wmd.2.2018.01.16.06.32.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:32:47 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w0GEWl38009662 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 16 Jan 2018 15:32:47 +0100 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.251]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w0GEWlmI027127; Tue, 16 Jan 2018 15:32:47 +0100 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] Fix some compiler warnings if !CONFIG_HASH_VERIFY Date: Tue, 16 Jan 2018 15:30:10 +0100 Message-Id: <20180116143010.30298-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.15.1 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.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: , Fix "statement with no effect [-Wunused-value]" and "unused variable [-Wunused-variable]" warnings caused by swupdate_HASH_update() and swupdate_HASH_final() calls if !CONFIG_HASH_VERIFY. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- include/sslapi.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/include/sslapi.h b/include/sslapi.h index 59eaf73..6b742f4 100644 --- a/include/sslapi.h +++ b/include/sslapi.h @@ -91,8 +91,26 @@ int swupdate_HASH_compare(unsigned char *hash1, unsigned char *hash2); #define swupdate_dgst_init(sw, keyfile) ( 0 ) #define swupdate_HASH_init(p) ( NULL ) #define swupdate_verify_file(dgst, sigfile, file) ( 0 ) -#define swupdate_HASH_update(p, buf, len) (-1) -#define swupdate_HASH_final(p, result, len) (-1) +static inline int swupdate_HASH_update(struct swupdate_digest *dgst, + unsigned char *buf, size_t len); +static inline int swupdate_HASH_update(struct swupdate_digest *dgst, + unsigned char *buf, size_t len) +{ + (void)dgst; + (void)buf; + (void)len; + return -1; +} +static inline int swupdate_HASH_final(struct swupdate_digest *dgst, + unsigned char *md_value, unsigned int *md_len); +static inline int swupdate_HASH_final(struct swupdate_digest *dgst, + unsigned char *md_value, unsigned int *md_len) +{ + (void)dgst; + (void)md_value; + (void)md_len; + return -1; +} #define swupdate_HASH_cleanup(sw) #define swupdate_HASH_compare(hash1,hash2) (0) #endif