diff mbox series

[meta,09/12] class: move swupdate_extract_keys to lib

Message ID 20220405071005.3855186-10-sbabic@denx.de
State Changes Requested
Headers show
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 | 17 -----------------
 classes/swupdate-lib.bbclass    |  5 -----
 2 files changed, 22 deletions(-)
diff mbox series

Patch

diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass
index 7d60a6f..79b2246 100644
--- a/classes/swupdate-common.bbclass
+++ b/classes/swupdate-common.bbclass
@@ -51,23 +51,6 @@  def swupdate_getdepends(d):
 
     return depstr
 
-def swupdate_extract_keys(keyfile_path):
-    try:
-        with open(keyfile_path, 'r') as f:
-            lines = f.readlines()
-    except IOError:
-        bb.fatal("Failed to open file with keys %s" % (keyfile))
-
-    data = {}
-    for _ in lines:
-        k,v = _.split('=',maxsplit=1)
-        data[k.rstrip()] = v
-
-    key = data['key'].rstrip('\n')
-    iv = data['iv'].rstrip('\n')
-
-    return key,iv
-
 def swupdate_write_sha256(s):
     import re
     write_lines = []
diff --git a/classes/swupdate-lib.bbclass b/classes/swupdate-lib.bbclass
index f8acd03..233eca1 100644
--- a/classes/swupdate-lib.bbclass
+++ b/classes/swupdate-lib.bbclass
@@ -4,17 +4,12 @@ 
 
 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: