From patchwork Sun Jan 21 11:16:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 864040 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:4010:c07::23b; helo=mail-lf0-x23b.google.com; envelope-from=swupdate+bncbcxploxj6ikrbapnshjqkgqehacsc3a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="N/gL+aQD"; dkim-atps=neutral Received: from mail-lf0-x23b.google.com (mail-lf0-x23b.google.com [IPv6:2a00:1450:4010:c07::23b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zPX7T2KnRz9t3h for ; Sun, 21 Jan 2018 22:16:20 +1100 (AEDT) Received: by mail-lf0-x23b.google.com with SMTP id k143sf1328478lfe.23 for ; Sun, 21 Jan 2018 03:16:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1516533377; cv=pass; d=google.com; s=arc-20160816; b=jT8UQU6WWC7X5mnV8XieEgF3qktxozXu5V6QM5iNMhPNsc1ptDEgU/wWOvkgOZMhgq iR6qfysVCku2/SCRfVgiynFtPwXNpgmrxd8E4PLXgLgr0AqZ1tazl+SNDRw/kUIUPgPR NyKyz8jdybfAn9QOPX9irHVHULdWjW+GQfGcI/N0EYh5mZbmK6BSexPDOk5S4qpD0wvn iRTWQw6ZLZEY7eq9ii6epGLvuz5wBFejWIjMV9c2sHuRN9ezDLD8DJY6n1ttXJpfzobV mAM1SnZyUvrQ7aOBfpdxUMxQ8sbmrQJ+OQ0YAkz7SZonf2RVOe4yBPoleil5qwFM2ctE Et+A== 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:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:sender :dkim-signature:arc-authentication-results; bh=pMUiwAq2vuEYX3B+ZKaJ4Ct6BLHpiduLS8HlVxcAzOI=; b=KuboSBZ1aUecU/O8p/hjqqIxYwqs2l3tcjCDqHVVbbDPtNX4vDDo2ERNgkI+XhjV+r 7V4WCGTzR2APiNcCKmMscaAbVps2yIsfgmEsDZH0WVezQ2XWOLA8qeWE7/yR/1BeAtqX 6tk0Zj7OuclwqctVmGekUv7D4igi/mZlW92dMqGIqkgfeShBBXsy50A0WK7ih1+Zqg4U 3IS+Rdf3A+4BWUSiazcCOPWCA3sTDUA7wZhhpBlFaFxKCltrOEb3gUEYJ/1m4mGYKTu4 Zx+f+1+aTZRCeaVuOUED15wEHn6KiYoqnKj1zM/fOGSsNggbL9nh18e7Eyhz4bMLhKzE 7wAQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=pMUiwAq2vuEYX3B+ZKaJ4Ct6BLHpiduLS8HlVxcAzOI=; b=N/gL+aQDMsQIJ5xJBLw2Oi9nM5MaiC51GHT2ou3q5MLRUVhjDbRyPn0OpVP90WsY0n jApfdcRS1pH0m8b3C1L/uYjraguQG0feHszxNs2ymk9dYdyA+3V3wWV6c3ZuvRc7IhZC SFu41vDcasxsmVE7KcUjKNG0WZ6+9sR3jRHdi930T1+UelLH7S6ypcvLOUar/sLwssuq 1R6lrHubbAOwhmSBX1IomQmXwrtr1Nl/pDgVASpaXQ4KbzzQWYywRXVuRnooBtQM0216 LUkqdxeUbRXsBmWIfBB90UEUluc2e5BenmyAhrUww5ghNgQ+hXjPVqbGjQ9f49Yl/Nek HmzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding: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=pMUiwAq2vuEYX3B+ZKaJ4Ct6BLHpiduLS8HlVxcAzOI=; b=nukECJqbpLSfE6Y7BSxxfZIT4Aacs3lZdQayFzRkiRF5Q6yNydC/bQ7cRzx1TMEBQq 057ArF5vd+TfFcYEkrYDheCVK0E7GveXIrJLt6fi3XSpNR3C9dkhgLrTPufIqSzR41ay +DTYZWpKMA8Spaz23r5COmEVv3gzigQ2EnDJNZBRD6VAlrn4rHhHBV3WTQ8+aH6BEAwe BcNFLd6+T8+PJQApBOcnrUMa9WQc73fonFllbe2TG1qT+iDawntTz4zgg1ZDw9xl+GCP 0eUQ5VtN38q9wfsvowivUW513aMiiN+72bKNbsd3/zy+8sF2yDzOY9/eu6bCu8nEEPlU UKCA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AKwxytdrVUKOrQfKlbwUJDtUiUILnj0w/hbQFTYO3flcZYPrkqvW840V +9p79BjC04WyZHxMTZzT0is= X-Google-Smtp-Source: AH8x224pjSlZkiCdnXYWxe+tqi2M1tQyG3LF0Zfr82bbgZ4hjQm8oHlvT6kHoNVEVbvKI/YmkaouNQ== X-Received: by 10.46.77.89 with SMTP id a86mr11806ljb.4.1516533377685; Sun, 21 Jan 2018 03:16:17 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 10.46.112.2 with SMTP id l2ls494415ljc.11.gmail; Sun, 21 Jan 2018 03:16:16 -0800 (PST) X-Received: by 10.46.48.4 with SMTP id w4mr269691ljw.20.1516533376946; Sun, 21 Jan 2018 03:16:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516533376; cv=none; d=google.com; s=arc-20160816; b=EJRqX1URsybbIrQpYwjTPuiLHIlj8dOYK4JggAdKtcLt4gFZc7JRg41oLsaFWe9vjm MBGGv6YcHf+1WqGqjKdDjXbs/SFZVl88KW/tpq6ox7UgOmmjpnGTPwG2w0QoG7XMkxNw 0KSAF+6L+yoJbQVcASK+DOzhEcSDBLFv9mULTGXmgnPDizimlfWmIplgFWSD3paL9Atj GOY1foDh0WQ+zhWEziZS1/pWmhUNbBTxjnVDZbRdfdZQOgg/wk7XibJjNv6uKBXlWuuw WOPlFXTjsavlpKasKl1D0mFBPmJxozUg4l0OWe3GpilAWeGiOgjvv1VrA/AwSolN7Ak4 GSKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=EZY7oaAlNuJxkUNIHn5uUNborJjVh3b1Clq6kfuAG8M=; b=QY/Z3oVJWDBOh6i7SRy/EoKO4lEhnCYITXJ4ByNFLyxKxJxzPGaiH6HPYcbtZ5VPak zGMJOMPOxFW08hL3Mb7FaELRi3DT55e4xlBp3VG/MefDzzLQinOdqKlyk/Y4zBc4r9o7 2ZQCVVIzdaMy9MAe2PIA7Q3eNmgSaHrGAg5cmUHA5R5ZQyof7mITPdaPNWd3KhoNPPz6 73At/GrUxrODIEo78GNNhKFjOM/veRJ2FKhFFdxhdDzHCBN5Jf8ahv81b88fmxdfxmm/ NDj+XPP/gkygPtoYdrYIXa19gWhhNY2/JIese23Mu+C2daGWQnS3woS8wn+AgJhp+epa 4N4A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id h92si1763331lfi.3.2018.01.21.03.16.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Jan 2018 03:16:16 -0800 (PST) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zPX7N1xSxz1r34k; Sun, 21 Jan 2018 12:16:16 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zPX7N1gNfz1qql5; Sun, 21 Jan 2018 12:16:16 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id bZAJ0ePdFlFv; Sun, 21 Jan 2018 12:16:15 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sun, 21 Jan 2018 12:16:15 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 26171454045E; Sun, 21 Jan 2018 12:16:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ql5fpQnLfMCS; Sun, 21 Jan 2018 12:16:11 +0100 (CET) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id 31F724540345; Sun, 21 Jan 2018 12:16:11 +0100 (CET) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic , Christian Storm Subject: [swupdate] [PATCH 1/3] Revert "Fix some compiler warnings if !CONFIG_HASH_VERIFY" Date: Sun, 21 Jan 2018 12:16:07 +0100 Message-Id: <1516533369-17072-1-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de 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: , This reverts commit 15a08c0081c5f2b012a5418bcf8403d557337141. Commit introduces build error if openssl is not used. include/sslapi.h:96:19: error: conflicting types for ‘swupdate_HASH_update’ static inline int swupdate_HASH_update(struct swupdate_digest *dgst, Signed-off-by: Stefano Babic CC: Christian Storm --- include/sslapi.h | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/include/sslapi.h b/include/sslapi.h index bc1177d..ca27f42 100644 --- a/include/sslapi.h +++ b/include/sslapi.h @@ -91,26 +91,8 @@ 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 ) -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_update(p, buf, len) (-1) +#define swupdate_HASH_final(p, result, len) (-1) #define swupdate_HASH_cleanup(sw) #define swupdate_HASH_compare(hash1,hash2) (0) #endif