From patchwork Tue Apr 5 15:17:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 606506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qfXYW01vSz9t5p for ; Wed, 6 Apr 2016 01:18:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=open-mesh-com.20150623.gappssmtp.com header.i=@open-mesh-com.20150623.gappssmtp.com header.b=MUXnaoF1; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 180BCB9165B; Tue, 5 Apr 2016 17:18:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: ** X-Spam-Status: No, score=2.4 required=5.0 tests=RDNS_NONE,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Tue, 5 Apr 2016 17:18:16 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 9B08DB91644 for ; Tue, 5 Apr 2016 17:18:13 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .open-mesh. - helo: .mail-wm0-f46.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-wm0-f46.google.com (unknown [74.125.82.46]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 5 Apr 2016 17:18:12 +0200 (CEST) Received: by mail-wm0-f46.google.com with SMTP id f198so36709633wme.0 for ; Tue, 05 Apr 2016 08:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=PlE7EFWnGHMTtGt8md0SdC081mEMFQr1Lu6Kif5M8Uw=; b=MUXnaoF13o1xj/isnb4dskOdaDheGVhqLBFD0DAW2M2HSWjqYoivdatWEDMTyastkQ qXH5nPdXBleeY5qC/LsTOdV0FKVzUkhd6ed+xlLe4CsVBDbgL2b7haMSsDNwijYdAcnF jOhCov9NIL6ZBWWBZyslZQ+vkWrlvSJYbU88BxpArYqt0/XW7UttK3nDcazAtA8e4fSR WaSxIjx12WcJUrLVlHc6duE39tgxHL28BrUfzC4nbu4JNz4VQ/ssecFRJPTVo1szU8v1 uk5qNA9HlZcT39RQt+B6+J5dIeIj3yReQiSQUKtIqW9vcnke/Fzw6ddHb36+N7NLKXyZ ULDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PlE7EFWnGHMTtGt8md0SdC081mEMFQr1Lu6Kif5M8Uw=; b=dSOyFo/QQU5D+qlloxsKQMCXJL5ZIgStv+X9I642hQac9itlbBM6PDUG8baHPnjbrm 9RqfHzlK8GmKl6huIlYjBHUk7vmxdkTpcBMrzlisnBBejt+f+ZV5K/fDsHuvz9d+iwgD GsO0Cns01aq9RFtlb8Mb7+uYToE0XvHqKLckJpqe0yebWdBdkqMsHyCc8rg1sBpgFMfi 0bb4czkJQrJad6pNxOIPLWLlUCAAeXcwJCsgE8C/i1Uhk7PtM6aUZRXMqtRX8ZH6s4wa tQSfwuKPNOfP5R7P/eUIOpdPHrLvF2RNeFungT99MsU2vDq/QiUA5sADF+Mh9Ip3ENBU TK8Q== X-Gm-Message-State: AD7BkJIZMn4p1IaP0mcHRoy3JCPiv2KnwZDJWGtGKfz1/Di8EFAN6F2m2SrSZVzoXir0afpe X-Received: by 10.28.173.71 with SMTP id w68mr18936288wme.88.1459869491728; Tue, 05 Apr 2016 08:18:11 -0700 (PDT) Received: from sven-desktop.home.narfation.org (x5d84b455.dyn.telefonica.de. [93.132.180.85]) by smtp.gmail.com with ESMTPSA id c144sm19989177wmd.0.2016.04.05.08.18.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 08:18:11 -0700 (PDT) From: Sven Eckelmann X-Google-Original-From: Sven Eckelmann To: openwrt-devel@lists.openwrt.org Date: Tue, 5 Apr 2016 17:17:46 +0200 Message-Id: <1459869481-29376-1-git-send-email-sven@open-mesh.com> X-Mailer: git-send-email 2.8.0.rc3 Subject: [OpenWrt-Devel] [PATCH 01/16] scripts/om-fwupgradecfg-gen.sh: Generate sha256sum for uboot verification X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Eckelmann MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Sven Eckelmann Future Open Mesh u-boot versions are changing the check of the image files (vmlinux, rootfs) from md5 to sha256. Having both in them should be enough to ensure backward and forward compatibility. Signed-off-by: Sven Eckelmann --- scripts/om-fwupgradecfg-gen.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/om-fwupgradecfg-gen.sh b/scripts/om-fwupgradecfg-gen.sh index fab1582..e208e6d 100644 --- a/scripts/om-fwupgradecfg-gen.sh +++ b/scripts/om-fwupgradecfg-gen.sh @@ -42,6 +42,7 @@ CHECK_BS=65536 KERNEL_SIZE=$(stat -c%s "$KERNEL_PATH") KERNEL_MD5=$(md5=$(md5sum $KERNEL_PATH); echo ${md5%% *}) +KERNEL_SHA256=$(openssl dgst -sha256 $KERNEL_PATH | awk '{print $2}') KERNEL_PART_SIZE=$(size=$(($KERNEL_SIZE / $FLASH_BS)); [ $(($size * $FLASH_BS)) -lt $KERNEL_SIZE ] && size=$(($size + 1)); echo $(($size * $FLASH_BS / 1024))) ROOTFS_FLASH_ADDR=$(addr=$(($KERNEL_FLASH_ADDR + ($KERNEL_PART_SIZE * 1024))); printf "0x%x" $addr) @@ -49,6 +50,7 @@ ROOTFS_SIZE=$(stat -c%s "$ROOTFS_PATH") ROOTFS_CHECK_BLOCKS=$((($ROOTFS_SIZE / $CHECK_BS) - $MD5_SKIP_BLOCKS)) ROOTFS_MD5=$(md5=$(dd if=$ROOTFS_PATH bs=$CHECK_BS count=$ROOTFS_CHECK_BLOCKS 2>&- | md5sum); echo ${md5%% *}) ROOTFS_MD5_FULL=$(md5=$(md5sum $ROOTFS_PATH); echo ${md5%% *}) +ROOTFS_SHA256_FULL=$(openssl dgst -sha256 $ROOTFS_PATH | awk '{print $2}') ROOTFS_CHECK_SIZE=$(printf '0x%x' $(($ROOTFS_CHECK_BLOCKS * $CHECK_BS))) ROOTFS_PART_SIZE=$(($MAX_PART_SIZE - $KERNEL_PART_SIZE)) @@ -57,6 +59,7 @@ cat << EOF > $CFG_OUT filename=kernel md5sum=$KERNEL_MD5 filemd5sum=$KERNEL_MD5 +filesha256sum=$KERNEL_SHA256 flashaddr=$KERNEL_FLASH_ADDR checksize=0x0 cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; saveenv @@ -66,6 +69,7 @@ cmd_fail=reset filename=rootfs md5sum=$ROOTFS_MD5 filemd5sum=$ROOTFS_MD5_FULL +filesha256sum=$ROOTFS_SHA256_FULL flashaddr=$ROOTFS_FLASH_ADDR checksize=$ROOTFS_CHECK_SIZE cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; setenv rootfs_size_1 $ROOTFS_PART_SIZE; saveenv