From patchwork Mon Dec 4 10:05:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1871478 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=YmWaizcB; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=BAJfYlVp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33c; helo=mail-wm1-x33c.google.com; envelope-from=swupdate+bncbdy5juxlviebbj6jw2vqmgqe47dcxkq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-wm1-x33c.google.com (mail-wm1-x33c.google.com [IPv6:2a00:1450:4864:20::33c]) (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 4SkK7w3RTTz23p6 for ; Mon, 4 Dec 2023 21:06:36 +1100 (AEDT) Received: by mail-wm1-x33c.google.com with SMTP id 5b1f17b1804b1-40b443d698esf29908195e9.2 for ; Mon, 04 Dec 2023 02:06:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701684392; cv=pass; d=google.com; s=arc-20160816; b=tL70a5kl0+itiYylcbnxxbFvQPfvb3sG7tJuzJFYxKCd4MQFAjFK4JBYYYlh2G55AL Mn6PRz6Qk12Nrk8l77uEQyu+BtjWyHn5y3R3xd1RaAHBcsXKcFQdPb9t0IZKvBrcGFVH oHE3UqfrVdflxWF3D9KHT1SVTWL5khTcdbBchhwCFKdrPh7NibHK5lWHOn2B3Y/uz12C FaBiZ8ZVH+WLAO5OImZCz9NQ/2twePi+aVAa4nu/eITOzzXkpOh2SfYQ8WIohLi0nKMI z2lt5DKLq+Z5Mv4LQTFqnbw8TRzDWghzl91+5oAIODt+RT0vVqhAM6Ay69RgvSwaGs1u BvQA== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=DeTYjgq/RA7gE4PBxnnBnPa3GqGrnYqPchHO5oj9o54=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=U30akb31o3qTVrGlYcwrC1PGzjnUsqhgSbsGnZQCdBYuCfwPhtdzcbxaiR1xG2d5EY Y5XVu27i2ozh18hr+StD0wrIeOZMqn7a9hsrJTnZygT6IsOTzkjKz2Cnx77+Y1Yj2JO0 gHkltYv423yW28khA8Q8uT2dC52qvxyQBnB737O6OVzQI5DYOtE8sngZAKdHIBFb5IXA tHqAW5nqjplNvvy+nSpGet9jdm39fMqG2p/FlwBhT0QcCMM7fGNMD3ToziP5tsGKLeu+ CqIbftZ/7wH8NKyoM3ijHGUSyu4JGppLtOu38ecZkAIJTCH4orHrJO/5clsvwS5X2qMe iUBw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=I9Eszmgs; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::534 as permitted sender) smtp.mailfrom=m.glembo@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=1701684392; x=1702289192; 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:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=DeTYjgq/RA7gE4PBxnnBnPa3GqGrnYqPchHO5oj9o54=; b=YmWaizcBC4bRAQ9flPHwbi25oewdmCpsWPM6drks6BL4e8I+FkXNgNJ0Sb/JjldKlC iR8Y+LJpxBQn6y9CbZSX9pND0sser8B3+Y6gTB8Krfbb/5kdXclZxZIiRnZAoXnSY372 6nmUlqC/VGMVdRZCpCD+NFWRJ6fJp9u280h1fRcPzPRXoYAhRg3CHKlDJTsFUP1XApvW UfEI5D5wIyPUDgXZ3VynEc/H9tNBQBojHjSCUnO07tKVwdou841I4NMqmdwF/eiSLSUJ PaCqA6BO6iMy/b8BZMS/v+8joqtt6Ueu43PZwXJZ9scooQiwAdZOXZ+1Q7oJf+7QgEtJ rimw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701684392; x=1702289192; 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:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=DeTYjgq/RA7gE4PBxnnBnPa3GqGrnYqPchHO5oj9o54=; b=BAJfYlVpbT7/QzUZaGGOx4Q2WwkWAygwWZb9Zw9kvGohbukh0jWzn05Lv7JNrUTLC0 r/MGZby1mC4pe3oSCc3OtV08Gdtcqz27rNXpFW10Nn45PUr1XmpvcPqpriXTqgq4Ir1P OifpScSg8pNdazvkYW5j8nTqJ0wpyuXKJI722bbj0QyBC3Fxjc/rlszunWALAMKz82aE rM4GtkC900Hu7TMwi4wWp1OkxwpKpfaBntKSqlxi675I3gv9f5IK3nbL2o2QHKIm75Vi SP5JAGSMHXJOts+bi99i6/8a92jCQFw+moozKOvijx1l4Zom2QShFy5cgaqwOYvfoCuI jIoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701684392; x=1702289192; 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 :references:in-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=DeTYjgq/RA7gE4PBxnnBnPa3GqGrnYqPchHO5oj9o54=; b=rE50U7Fn3Tm5sHbBV52vQZhLEDqbUkG2W3ypbwvU0/WtcV5Wmuewyj6e9ARz2LtrqX tlNmsGbzCPQDCexOlqeDFhUL7VmpuxFQWmiD5g4mh8dhWCRJixUUnmAaDakFasiyQtfK qJf+F5COM2sxx01PNxUDxD54GvDnQeSgtvZsx5/nP5mBl0UZ0h7j0xZ2etSMYdWKW5UX 6XNIQY0w5YwBcAKzX/Fi1Jx4WzMO41wZie9v7FQw1akD4Jfg93TZr2jslHk1y+QeK6w/ /TFoCizoIARUP+xQ4hIOAs4epbjPkKBIz0uv2J3rrd2EMB+6cIOfyaK5Or7BUm1/q9HK erZg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YwMdJXAL71qTHAHxqpgfw/oR74WatOwOGnhyxkxsRpzMns891zc 3WuAnXvoHIZLa3lJUyIWwCo= X-Google-Smtp-Source: AGHT+IGLs1qglUmRI5l4aHvoB9xKGtB33WgGgety3aUdZ+gXe4zKJ11iNRTsJOfE6eeJteXf4CKvTg== X-Received: by 2002:a05:600c:16d3:b0:408:fe93:a2f7 with SMTP id l19-20020a05600c16d300b00408fe93a2f7mr2328936wmn.37.1701684391636; Mon, 04 Dec 2023 02:06:31 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:3b9e:b0:40b:31e2:cf43 with SMTP id n30-20020a05600c3b9e00b0040b31e2cf43ls153726wms.1.-pod-prod-04-eu; Mon, 04 Dec 2023 02:06:29 -0800 (PST) X-Received: by 2002:a05:600c:3782:b0:40c:90b:77d4 with SMTP id o2-20020a05600c378200b0040c090b77d4mr1038912wmr.163.1701684389503; Mon, 04 Dec 2023 02:06:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701684389; cv=none; d=google.com; s=arc-20160816; b=XOHa+xEk9oAhf+3/mbZfsxVgbzQEOSybhPBdJKKTFGtfLGSvTLaEzmLwaBYVB1Jvq5 CcdQsQo3zcoEltcqwTX74q2XthbZH6oZy0hsCJgGmwd0nrVU8b7KNPtJebuNDTb7XeVc b5xtCv7+HzxLN7jMlT473wxT3F/KZ50tngRrVSIjVtf30Hbqx9Ylxr2UgR+n+JIQa2Jx z4CWMnARGoLXr8ZONtdV8SeB2HPi7wWmGKYBQ7uqAMUp7OkcrzY1OaXuC16E6YgVtX4t 3ypOc/pAlsMqUvPzqvS9l6K3buAdipju66EODHQuppXkmO4FpeOJu6X1JZ9F7vwMq75e X1cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=CLS8JDbE9P6G11xe1/SPl+uWQKqdwM89sSaMDj67i00=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=guvS4LKNOQUTiWfHDFwq27k5KQFGHPHFSERNbpCIu7nWkZwIkzOPzWljYoMFRMEe0S 6tisp1QIHjz7XeVLdIJrH2OcG20KuunBDPyDPsKtBLmP7wHN9WOOevy1lCJIWkZ0qsSJ afwCqszfaH+cXM/sCtwHnr02noFBnnV26ORk8eNDJrqg0x+Ql5I8nWiZzKhYLD0JFeLw KRfk2M1SECrfVIgpFW9NWGpVU8K+9MG229/0Nfw/Q0Q+iU836k7cTQn4ab9kHq2nzTwo C8M/6a1L9reqikUmQnyBM/5xS/kCu9xmen0TBgsABlezgKUzZn7kMUDJFE+A6Pmsi7Yv V3vA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=I9Eszmgs; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::534 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com. [2a00:1450:4864:20::534]) by gmr-mx.google.com with ESMTPS id p35-20020a05600c1da300b0040b4055397csi712244wms.1.2023.12.04.02.06.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Dec 2023 02:06:29 -0800 (PST) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::534 as permitted sender) client-ip=2a00:1450:4864:20::534; Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-54b8276361cso5190349a12.0 for ; Mon, 04 Dec 2023 02:06:29 -0800 (PST) X-Received: by 2002:a17:906:3f16:b0:a19:a19b:78bb with SMTP id c22-20020a1709063f1600b00a19a19b78bbmr3022619ejj.126.1701684388651; Mon, 04 Dec 2023 02:06:28 -0800 (PST) Received: from PC-2635.irisgmbh.local (dslb-002-203-161-041.002.203.pools.vodafone-ip.de. [2.203.161.41]) by smtp.gmail.com with ESMTPSA id js22-20020a17090797d600b00a1b32663d7csm2032919ejc.102.2023.12.04.02.06.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 02:06:28 -0800 (PST) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [V2][PATCH 04/10] parser: Read aes-key from sw-description into struct img_type Date: Mon, 4 Dec 2023 11:05:36 +0100 Message-ID: <20231204100620.27789-5-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204100620.27789-1-Michael.Glembotzki@iris-sensing.com> References: <20231204100620.27789-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=I9Eszmgs; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::534 as permitted sender) smtp.mailfrom=m.glembo@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: , Signed-off-by: Michael Glembotzki --- include/swupdate_image.h | 1 + parser/parser.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/swupdate_image.h b/include/swupdate_image.h index 592a886..1ba1d22 100644 --- a/include/swupdate_image.h +++ b/include/swupdate_image.h @@ -56,6 +56,7 @@ struct img_type { int preserve_attributes; /* whether to preserve attributes in archives */ bool is_encrypted; char ivt_ascii[33]; + char aeskey_ascii[65]; /* AES_256_KEY_LEN*2+1 */ int install_directly; int is_script; int is_partitioner; diff --git a/parser/parser.c b/parser/parser.c index 60f979a..0d5f03e 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -452,6 +452,7 @@ static int parse_common_attributes(parsertype p, void *elem, struct img_type *im get_field(p, elem, "install-if-higher", &image->id.install_if_higher); get_field(p, elem, "encrypted", &image->is_encrypted); GET_FIELD_STRING(p, elem, "ivt", image->ivt_ascii); + GET_FIELD_STRING(p, elem, "aes-key", image->aeskey_ascii); if (is_image_installed(&cfg->installed_sw_list, image)) { image->skip = SKIP_SAME;