X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FRsa2048Sha256Sign%2FRsa2048Sha256GenerateKeys.py;fp=BaseTools%2FSource%2FPython%2FRsa2048Sha256Sign%2FRsa2048Sha256GenerateKeys.py;h=e49e819c9a06f16e7a549180962fea28d1ba2cbe;hb=86e6cf98a8493574878286522078050ac4dd505d;hp=1be360f7430f389b2b0b939f26598b07e4ed22a3;hpb=a09f4c91f785e36f0987aa3a6d7656ba51e6aeda;p=mirror_edk2.git

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
index 1be360f743..e49e819c9a 100644
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
@@ -82,7 +82,7 @@ if __name__ == '__main__':
   if Process.returncode != 0:
     print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')
     sys.exit(Process.returncode)
-  print(Version[0])
+  print(Version[0].decode())
 
   args.PemFileName = []
 
@@ -117,19 +117,19 @@ if __name__ == '__main__':
       args.PemFileName.append(Item.name)
       Item.close()
 
-  PublicKeyHash = ''
+  PublicKeyHash = bytearray()
   for Item in args.PemFileName:
     #
     # Extract public key from private key into STDOUT
     #
     Process = subprocess.Popen('%s rsa -in %s -modulus -noout' % (OpenSslCommand, Item), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    PublicKeyHexString = Process.communicate()[0].split('=')[1].strip()
+    PublicKeyHexString = Process.communicate()[0].split(b'=')[1].strip()
     if Process.returncode != 0:
       print('ERROR: Unable to extract public key from private key')
       sys.exit(Process.returncode)
-    PublicKey = ''
+    PublicKey = bytearray()
     for Index in range (0, len(PublicKeyHexString), 2):
-      PublicKey = PublicKey + chr(int(PublicKeyHexString[Index:Index + 2], 16))
+      PublicKey = PublicKey + PublicKeyHexString[Index:Index + 2]
 
     #
     # Generate SHA 256 hash of RSA 2048 bit public key into STDOUT
@@ -155,14 +155,14 @@ if __name__ == '__main__':
   #
   PublicKeyHashC = '{'
   for Item in PublicKeyHash:
-    PublicKeyHashC = PublicKeyHashC + '0x%02x, ' % (ord(Item))
+    PublicKeyHashC = PublicKeyHashC + '0x%02x, ' % (Item)
   PublicKeyHashC = PublicKeyHashC[:-2] + '}'
 
   #
   # Write SHA 256 of 2048 bit binary public key to public key hash C structure file
   #
   try:
-    args.PublicKeyHashCFile.write (PublicKeyHashC)
+    args.PublicKeyHashCFile.write (bytes(PublicKeyHashC))
     args.PublicKeyHashCFile.close ()
   except:
     pass