From patchwork Thu Jul 21 11:45:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayoub Zaki X-Patchwork-Id: 1658974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=kU/1Rf4+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13a; helo=mail-lf1-x13a.google.com; envelope-from=swupdate+bncbdbktzhrzujrbtpy4slamgqec4xx4ay@googlegroups.com; receiver=) Received: from mail-lf1-x13a.google.com (mail-lf1-x13a.google.com [IPv6:2a00:1450:4864:20::13a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LpW3F0JlGz9s07 for ; Thu, 21 Jul 2022 21:45:27 +1000 (AEST) Received: by mail-lf1-x13a.google.com with SMTP id g3-20020a05651222c300b00489fe30ee90sf665587lfu.20 for ; Thu, 21 Jul 2022 04:45:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658403918; cv=pass; d=google.com; s=arc-20160816; b=hglvstPS5qav8diS+I+Ur/rlSMu6CUAA/uhJZ54t5yAQClDFCx+oWpc3/AuuDsi8Un tyBYmXUFbRnNnhFajdgIh4Z9TZHy4m9a3crFZfw8nENq2GzdtNT7R4s1dblDep8PRBqa VgZ6Q6c+ja/dilQ58wmya3ugM0hGZFLP/nOqXGC601ovhqgKb/Gs0DLg6AmbGF+f9kym w6YHQ+mMJCGNzOMly4HJndCxqYq49Qy1GfFoDV2YvgUUNcVEOJM0x/bXTZ1g22/Xb26E QRYQw+AB3RjSYeFrhHCPeCu6N5lULSVff1qf1sJX7g1Y6OmUHVxXg6Xfq2mokyJOiT7D 4XfQ== 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:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=K+v0RYutNdNJ8Ox1isCszFj0lABet9UJVjtS75W3UWI=; b=rNFqqBLp+5NRHoZErbyWTiKMcVMFF8l1zBhAC0Sl3xDjCsSsD2Crx8OzQeLJ2J9Lsw +IGgXKVBZKLXV3v4HXmc+cmY8DCVLa7tEQ2bzYgXgvJXrAOoVQPb3iTqPkPctp3GLTJM vXoNMuhyXFw1Nn0ddUYlfTIOY72hcQ3Gmj/mA++2S2pYME8nEL4f2xVsvM238pSeHGKc xHbEdbV2+e99JA70SSQ7cF+yYMDGSzdvzpPas/aox/GJgqmBs571SUco1uD8r3T5fMEY 3R8GiGTlPTk51bUl8GogNdpcI9DnQsKWkhVmjWC3Io6hOF87gUDC2wtUGMPuIP2HxJ8P xK/A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@embexus.com header.s=rsa1 header.b=KnbtF79S; dkim=neutral (no key) header.i=@embexus.com; spf=neutral (google.com: 46.30.212.10 is neither permitted nor denied by best guess record for domain of ayoub.zaki@embexus.com) smtp.mailfrom=ayoub.zaki@embexus.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=K+v0RYutNdNJ8Ox1isCszFj0lABet9UJVjtS75W3UWI=; b=kU/1Rf4+Z5phNd0lP4awet/M6e8AwilD7eLbQ5TyaMV69PrZb2zEIF70dbwCt3n1B3 gC2LBpMr+8Ku0Taut1pUmMnZ3wLkciH7OGbh+ydos4Vxm6A8fi+uzyVWAWXB94DFwxTv 48zoOo8ztCH4H+CD5uP8VHiDPp6KRf/WFlqDxZ9WJAKnbG2dVaXOQaQc24VG23boRFZq hSneCeHdGylYqCKKZ5iBcTJEQIg4KLV1forS57l8VtHGu2lzgRUeZzns3E0vXHzEMuHt yt56gCeAj4xuj/fTakOyG6j/W5sAHgj2ZimIuZ45izJdlVtJtZyfrkg3biUHZpaT7h+q m4Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version: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=K+v0RYutNdNJ8Ox1isCszFj0lABet9UJVjtS75W3UWI=; b=gml29mMNiEIS4hOWUW7mRx7Dw9xyyAFRK5X0NbWDBVorkUzyMGK4cvoKmJitbU6r/+ DtLa1veQCaDs47VMPZaMcOmf5cPxQkOAbnb+SOzZ7MrDMAYyQOiKji1Q5VsnyWmy1JKg JM/sy81oCnG/CEHVYW7ksLiOzb2yqD2eY4/P61N0YffKZEGuA3WDfY6a5CODE+reyiAE RRSSvvO5PwnQ2G7H6KkaCbokQXm1cKM4vgpJ+kdSTTvJlMak4b5b6c+56HDZJ6h4frRF w4d9Sa64ZniqWdRwE2bMzGLe2aVgTgCLeQmvUjNWkucNDi8RoKWa4bV3YuKzUSDhZ/n9 GDjA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AJIora+VD3t1fcTaJdOhVaKEunQUmlrr94cISmZZE/FKO9RrsC1aSnRt 3vd4SgeD5QbKWD9eEpmSmt8= X-Google-Smtp-Source: AGRyM1vDcYEaK0gWt1WsiroJF5kV3I0xkBlASbO2/slgIY5M4c0OXDcou1ulk+Q1u55EnOGiQeE7WA== X-Received: by 2002:a2e:a5c9:0:b0:25d:e682:cc78 with SMTP id n9-20020a2ea5c9000000b0025de682cc78mr934518ljp.0.1658403918430; Thu, 21 Jul 2022 04:45:18 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:154a:b0:25d:b04e:9cc5 with SMTP id y10-20020a05651c154a00b0025db04e9cc5ls525468ljp.11.-pod-prod-gmail; Thu, 21 Jul 2022 04:45:16 -0700 (PDT) X-Received: by 2002:a2e:bd89:0:b0:25a:9386:75d0 with SMTP id o9-20020a2ebd89000000b0025a938675d0mr19482576ljq.431.1658403916669; Thu, 21 Jul 2022 04:45:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658403916; cv=none; d=google.com; s=arc-20160816; b=j5Iy8jMMg9d9DgyuUl0NDDWY30AEHCAqbHNerOCLrkoLv3ATqeG6rBPTlZfrRV3vzZ bvzKcoOV1H9vyPIEyxkTTNBYxQ39mFIGyCJ4LGu52lu7krfiyfpogjpTsqqzFv4Ob4si qjjqY/zYA842MFrFWC2PH4qRghF6jmDJLAlMlm56smjNHjnaTMK4garB+BsTwkfAwcvs sVX0WE8QnWPBGCwgnyHtlYCvdFBtsVXIxL+A/YQS6PKbSFEpOPUELn3OtpGWwJv5NnyT Unn3lPtLcsLXAcTMxl+LUXxOgBa0jmPvKzP5GtQ4cQQDJYTfJtbzYKXR20W8ovdFh5hV tPGw== 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:dkim-signature:dkim-signature; bh=9VcpS7Afm8l3DcddzdPoyrwwZNzHNxvfXEZV1ZI95j4=; b=TCycndvyhUODknVEcj9JM+kMY8ysMn1U1/XXJgVECVUobjY48mfoSqC/GUSPQZAUOP iahL+H1pf2YkXKx7NySlnIeIjZGAYWSu+kzaLsOh/xBftaOqrJXLVHjywOAQD97+KPgo r5wIz1KvgBepKNNBC1HsVBLyzEfO7zPG8gexThpXAmu8ol/LjYwt8hfSAlPDH8z34D2J UpbvwJyTXxyOCHqNBXXPaFoqVv/ZGD3bY7i2LCcFbHRKkVe82Neyk2pb0ZMc4VZ2a7nc PhhKJdUHYlD5LQFo+5FrpofHuX+vV7eQMNWMAyMyJvlaS3V0JYs+ha0o2L70pUonwNd/ Z8Ew== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@embexus.com header.s=rsa1 header.b=KnbtF79S; dkim=neutral (no key) header.i=@embexus.com; spf=neutral (google.com: 46.30.212.10 is neither permitted nor denied by best guess record for domain of ayoub.zaki@embexus.com) smtp.mailfrom=ayoub.zaki@embexus.com Received: from mailrelay1-3.pub.mailoutpod1-cph3.one.com (mailrelay1-3.pub.mailoutpod1-cph3.one.com. [46.30.212.10]) by gmr-mx.google.com with ESMTPS id g4-20020a056512118400b0048a6c3cdc7csi57204lfr.13.2022.07.21.04.45.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 04:45:16 -0700 (PDT) Received-SPF: neutral (google.com: 46.30.212.10 is neither permitted nor denied by best guess record for domain of ayoub.zaki@embexus.com) client-ip=46.30.212.10; X-HalOne-Cookie: bfcbe3f4e1f323822a7db179f2754debf3537596 X-HalOne-ID: 96153034-08ea-11ed-a6c8-d0431ea8a283 Received: from xps13.fritz.box (dynamic-2a02-3102-8c10-00a0-3016-dae8-1a8d-20b5.310.pool.telefonica.de [2a02:3102:8c10:a0:3016:dae8:1a8d:20b5]) by mailrelay1.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id 96153034-08ea-11ed-a6c8-d0431ea8a283; Thu, 21 Jul 2022 11:45:15 +0000 (UTC) From: Ayoub Zaki To: swupdate@googlegroups.com Cc: Ayoub Zaki Subject: [swupdate] [swugenerator][PATCH] extract_keys: fix parsing encyption keyfile Date: Thu, 21 Jul 2022 13:45:14 +0200 Message-Id: <20220721114514.52930-1-ayoub.zaki@embexus.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: ayoub.zaki@embexus.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@embexus.com header.s=rsa1 header.b=KnbtF79S; dkim=neutral (no key) header.i=@embexus.com; spf=neutral (google.com: 46.30.212.10 is neither permitted nor denied by best guess record for domain of ayoub.zaki@embexus.com) smtp.mailfrom=ayoub.zaki@embexus.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: Ayoub Zaki --- swugenerator/main.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/swugenerator/main.py b/swugenerator/main.py index 4fe9dd4..36d629a 100644 --- a/swugenerator/main.py +++ b/swugenerator/main.py @@ -24,14 +24,16 @@ def extract_keys(keyfile): logging.fatal("Failed to open file with keys %s" % (keyfile)) exit(1) - data = {} - for _ in lines: - k,v = _.split() - data[k.rstrip()] = v - - key = k.rstrip('\n') - iv = v.rstrip('\n') - return key, iv + k, v = None, None + for line in lines: + if 'key' in line: + k = line.split('=')[1] + if 'iv' in line: + v = line.split('=')[1] + if None not in (k, v): + k = k.rstrip('\n') + v = v.rstrip('\n') + return k, v def main() -> None: