[meta,08/12] class: move swupdate_encrypt_file to lib

Message ID	20220405071005.3855186-9-sbabic@denx.de
State	Changes Requested
Headers	show Return-Path: <swupdate+bncBCXPLOXJ6IKRBXGWV6JAMGQEDBONFNI@googlegroups.com> Sender: swupdate@googlegroups.com Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.10; From: Stefano Babic <sbabic@denx.de> To: swupdate@googlegroups.com Cc: Stefano Babic <sbabic@denx.de> Subject: [swupdate] [meta swupdate] [ 08/12] class: move swupdate_encrypt_file to lib Date: Tue, 5 Apr 2022 09:10:01 +0200 Message-Id: <20220405071005.3855186-9-sbabic@denx.de> In-Reply-To: <20220405071005.3855186-1-sbabic@denx.de> References: <20220405071005.3855186-1-sbabic@denx.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com
Series	Support to call functions inside sw-description \| expand [meta,00/12] Support to call functions inside sw-description [meta,01/12] Evaluate functions inside sw-description [meta,02/12] swupdate-common: factorize function get_pwd_file_args [meta,03/12] class: add a library file for generic function [meta,04/12] Make usage of library class [meta,05/12] class: add function that signs and returns hash of artifact [meta,06/12] Add SPDX identifier to classes file [meta,07/12] class: move swupdate_get_sha256 to library [meta,08/12] class: move swupdate_encrypt_file to lib [meta,09/12] class: move swupdate_extract_keys to lib [meta,10/12] class: rework autoversion to be more generic [meta,11/12] rename swupdate_auto_versions to swupdate_get_pkgvar [meta,12/12] Raise a warning if old syntax for sha256 is used

Message ID

20220405071005.3855186-9-sbabic@denx.de

State

Changes Requested

Headers

Sender: swupdate@googlegroups.com
Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied
 by domain of sbabic@denx.de) client-ip=212.18.0.10;
From: Stefano Babic <sbabic@denx.de>
To: swupdate@googlegroups.com
Cc: Stefano Babic <sbabic@denx.de>
Subject: [swupdate] [meta swupdate] [ 08/12] class: move swupdate_encrypt_file
 to lib
Date: Tue,  5 Apr 2022 09:10:01 +0200
Message-Id: <20220405071005.3855186-9-sbabic@denx.de>
In-Reply-To: <20220405071005.3855186-1-sbabic@denx.de>
References: <20220405071005.3855186-1-sbabic@denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list swupdate@googlegroups.com;
 contact swupdate+owners@googlegroups.com

Series

Support to call functions inside sw-description | expand

Commit Message

Stefano Babic April 5, 2022, 7:10 a.m. UTC

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 classes/swupdate-common.bbclass | 6 ------
 classes/swupdate-lib.bbclass    | 7 ++++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass
index e96e927..7d60a6f 100644
--- a/classes/swupdate-common.bbclass
+++ b/classes/swupdate-common.bbclass
@@ -68,12 +68,6 @@  def swupdate_extract_keys(keyfile_path):
 
     return key,iv
 
-def swupdate_encrypt_file(f, out, key, ivt):
-    import subprocess
-    encargs = ["openssl", "enc", "-aes-256-cbc", "-in", f, "-out", out]
-    encargs += ["-K", key, "-iv", ivt, "-nosalt"]
-    subprocess.run(encargs, check=True)
-
 def swupdate_write_sha256(s):
     import re
     write_lines = []
diff --git a/classes/swupdate-lib.bbclass b/classes/swupdate-lib.bbclass
index a776148..f8acd03 100644
--- a/classes/swupdate-lib.bbclass
+++ b/classes/swupdate-lib.bbclass
@@ -5,12 +5,16 @@ 
 DEPENDS += "python3-magic-native zstd-native"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 88a830f... class: move swupdate_encrypt_file to lib
 def swupdate_encrypt_file(f, out, key, ivt):
     import subprocess
     encargs = ["openssl", "enc", "-aes-256-cbc", "-in", f, "-out", out]
     encargs += ["-K", key, "-iv", ivt, "-nosalt"]
     subprocess.run(encargs, check=True)
 
+<<<<<<< HEAD
 def swupdate_extract_keys(keyfile_path):
     try:
         with open(keyfile_path, 'r') as f:
@@ -29,9 +33,6 @@  def swupdate_extract_keys(keyfile_path):
     return key,iv
 
 def swupdate_get_sha256(d, s, filename):
-=======
-def swupdate_sign_ec521_sha512(d, s, filename):
->>>>>>> c6ba564... class: move swupdate_get_sha256 to library
     import hashlib
 
     m = hashlib.sha256()

[meta,08/12] class: move swupdate_encrypt_file to lib

Commit Message

Patch