diff mbox series

[SWUGenerator] Fix generation if sw-description is encrypted

Message ID 20220917145913.113546-1-sbabic@denx.de
State Superseded
Headers show
Series [SWUGenerator] Fix generation if sw-description is encrypted | expand

Commit Message

Stefano Babic Sept. 17, 2022, 2:59 p.m. UTC 
Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 swugenerator/generator.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/swugenerator/generator.py b/swugenerator/generator.py
index 1dff641..5c90bc7 100644
--- a/swugenerator/generator.py
+++ b/swugenerator/generator.py
@@ -161,7 +161,8 @@  class SWUGenerator:
         swdesc = re.sub(r"\\n", '\n', swdesc)
         swdesc = re.sub(r"\\t", '\t', swdesc)
 
-        self.save_swdescription(os.path.join(self.temp.name, sw.filename), swdesc)
+        swdesc_filename = os.path.join(self.temp.name, sw.filename)
+        self.save_swdescription(swdesc_filename, swdesc)
 
         # Encrypt sw-description if required
         if self.encryptswdesc:
@@ -169,15 +170,14 @@  class SWUGenerator:
                 logging.critical("sw-description must be encrypted, but no encryption key is given")
 
             iv = self.aesiv
-            sw_desc_plain  = os.path.join(self.temp.name, 'sw-description.plain')
-            sw_desc_enc    = os.path.join(self.temp.name, 'sw-description.enc')
-            shutil.copyfile(sw.fullfilename, sw_desc_plain)
-            sw.encrypt(sw_desc_enc, self.aeskey, iv)
-            shutil.copyfile(sw_desc_enc, sw.fullfilename)
-            
+            sw.fullfilename = swdesc_filename
+            swdesc_enc = swdesc_filename + ".enc"
+            sw.encrypt(swdesc_enc, self.aeskey, iv)
+            shutil.copyfile(swdesc_enc, sw.fullfilename)
+            swdesc_filename = sw.fullfilename
+
         if self.signtool:       
-            sw_desc_in =  os.path.join(self.temp.name, 'sw-description.plain' 
-                                                if self.aeskey and self.encryptswdesc else 'sw-description')
+            sw_desc_in = swdesc_filename
             sw_desc_out = os.path.join(self.temp.name, 'sw-description.sig')
             self.signtool.prepare_cmd(sw_desc_in, sw_desc_out)
             self.signtool.sign()