[meta-swupdate,11/12] swupdate-enc: add missing $

Message ID	20191023211101.16591-12-adrian.freihofer@siemens.com
State	Changes Requested
Headers	show Return-Path: <swupdate+bncBAABB4EDYPWQKGQEFRA5USA@googlegroups.com> Sender: swupdate@googlegroups.com MIME-Version: 1.0 Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; From: Adrian Freihofer <adrian.freihofer@siemens.com> To: swupdate@googlegroups.com Cc: Adrian Freihofer <adrian.freihofer@siemens.com> Subject: [swupdate] [meta-swupdate][PATCH 11/12] swupdate-enc: add missing $ Date: Wed, 23 Oct 2019 23:11:00 +0200 Message-Id: <20191023211101.16591-12-adrian.freihofer@siemens.com> In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com
Series	simplify swupdate config \| expand [meta-swupdate,00/12] simplify swupdate config [meta-swupdate,01/12] swupdate: simplify find images added to swu [meta-swupdate,02/12] swupdate: ensure scripts are added before images [meta-swupdate,03/12] swupdate: support signed image with variable name [meta-swupdate,04/12] libubootenv: bump git srcrev [meta-swupdate,05/12] libubootenv: git define PV [meta-swupdate,06/12] swupdate git define PV [meta-swupdate,07/12] swupdate: bump git srcrev [meta-swupdate,08/12] swupdate: add missing rdepends [meta-swupdate,09/12] swupdate: improve systemd config [meta-swupdate,10/12] swupdate: update, fixes in do_install [meta-swupdate,11/12] swupdate-enc: add missing $

Message ID

20191023211101.16591-12-adrian.freihofer@siemens.com

State

Changes Requested

Headers

Sender: swupdate@googlegroups.com
MIME-Version: 1.0
Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com
	designates 192.35.17.28 as permitted sender)
	client-ip=192.35.17.28; 
From: Adrian Freihofer <adrian.freihofer@siemens.com>
To: swupdate@googlegroups.com
Cc: Adrian Freihofer <adrian.freihofer@siemens.com>
Subject: [swupdate] [meta-swupdate][PATCH 11/12] swupdate-enc: add missing $
Date: Wed, 23 Oct 2019 23:11:00 +0200
Message-Id: <20191023211101.16591-12-adrian.freihofer@siemens.com>
In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com>
References: <20191023211101.16591-1-adrian.freihofer@siemens.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list swupdate@googlegroups.com;
	contact swupdate+owners@googlegroups.com

Series

simplify swupdate config | expand

Comments

Stefano Babic Oct. 26, 2019, 8:19 p.m. UTC | #1

Hi Adrian,

On 23/10/19 23:11, Adrian Freihofer wrote:
> Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
> ---
>  classes/swupdate-enc.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/swupdate-enc.bbclass b/classes/swupdate-enc.bbclass
> index 5e3fe79..198ae98 100644
> --- a/classes/swupdate-enc.bbclass
> +++ b/classes/swupdate-enc.bbclass
> @@ -13,7 +13,7 @@ swu_encrypt_file() {
>  	key=`cat ${SWUPDATE_AES_FILE} | grep ^key | cut -d '=' -f 2`
>  	iv=`cat ${SWUPDATE_AES_FILE} | grep ^iv | cut -d '=' -f 2`
>  	salt=`cat ${SWUPDATE_AES_FILE} | grep ^salt | cut -d '=' -f 2`
> -	if [ -z ${salt} ] || [ -z ${key} ] || [ -z {iv} ];then
> +	if [ -z ${salt} ] || [ -z ${key} ] || [ -z ${iv} ];then
>  		bbfatal "SWUPDATE_AES_FILE=$SWUPDATE_AES_FILE does not contain valid keys"
>  	fi
>  	openssl enc -aes-256-cbc -in ${input} -out ${output} -K ${key} -iv ${iv} -S ${salt}
> 


Thanks for fixing this bug.

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

diff --git a/classes/swupdate-enc.bbclass b/classes/swupdate-enc.bbclass
index 5e3fe79..198ae98 100644
--- a/classes/swupdate-enc.bbclass
+++ b/classes/swupdate-enc.bbclass
@@ -13,7 +13,7 @@  swu_encrypt_file() {
 	key=`cat ${SWUPDATE_AES_FILE} | grep ^key | cut -d '=' -f 2`
 	iv=`cat ${SWUPDATE_AES_FILE} | grep ^iv | cut -d '=' -f 2`
 	salt=`cat ${SWUPDATE_AES_FILE} | grep ^salt | cut -d '=' -f 2`
-	if [ -z ${salt} ] || [ -z ${key} ] || [ -z {iv} ];then
+	if [ -z ${salt} ] || [ -z ${key} ] || [ -z ${iv} ];then
 		bbfatal "SWUPDATE_AES_FILE=$SWUPDATE_AES_FILE does not contain valid keys"
 	fi
 	openssl enc -aes-256-cbc -in ${input} -out ${output} -K ${key} -iv ${iv} -S ${salt}

[meta-swupdate,11/12] swupdate-enc: add missing $

Commit Message

Comments

Patch