BaseTools: Clean up source files

[mirror_edk2.git] / BaseTools / Source / Python / Rsa2048Sha256Sign / Rsa2048Sha256Sign.py

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
index 807772daff81322c81632916b921a425ad0b37e7..3fd7eefd6af5555c7d8678fa095f9d52f6177655 100644 (file)
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 \r
 import os\r
 import sys\r
-import argparse \r
+import argparse\r
 import subprocess\r
 import uuid\r
 import struct\r
@@ -33,7 +33,7 @@ from Common.BuildVersion import gBUILD_VERSION
 #\r
 __prog__      = 'Rsa2048Sha256Sign'\r
 __version__   = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)\r
-__copyright__ = 'Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.'\r
+__copyright__ = 'Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.'\r
 __usage__     = '%s -e|-d [options] <input_file>' % (__prog__)\r
 \r
 #\r
@@ -61,7 +61,7 @@ TEST_SIGNING_PRIVATE_KEY_FILENAME = 'TestSigningPrivateKey.pem'
 if __name__ == '__main__':\r
   #\r
   # Create command line argument parser object\r
-  #  \r
+  #\r
   parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')\r
   group = parser.add_mutually_exclusive_group(required=True)\r
   group.add_argument("-e", action="store_true", dest='Encode', help='encode file')\r
@@ -76,7 +76,7 @@ if __name__ == '__main__':
 \r
   #\r
   # Parse command line arguments\r
-  #  \r
+  #\r
   args = parser.parse_args()\r
 \r
   #\r
@@ -96,19 +96,19 @@ if __name__ == '__main__':
   #\r
   try:\r
     Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
-  except:  \r
+  except:\r
     print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')\r
     sys.exit(1)\r
-    \r
+\r
   Version = Process.communicate()\r
   if Process.returncode != 0:\r
     print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')\r
     sys.exit(Process.returncode)\r
   print(Version[0])\r
-  \r
+\r
   #\r
   # Read input file into a buffer and save input filename\r
-  #  \r
+  #\r
   args.InputFileName   = args.InputFile.name\r
   args.InputFileBuffer = args.InputFile.read()\r
   args.InputFile.close()\r
@@ -174,17 +174,17 @@ if __name__ == '__main__':
     if args.MonotonicCountStr:\r
       format = "%dsQ" % len(args.InputFileBuffer)\r
       FullInputFileBuffer = struct.pack(format, args.InputFileBuffer, args.MonotonicCountValue)\r
-    # \r
+    #\r
     # Sign the input file using the specified private key and capture signature from STDOUT\r
     #\r
     Process = subprocess.Popen('%s dgst -sha256 -sign "%s"' % (OpenSslCommand, args.PrivateKeyFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
     Signature = Process.communicate(input=FullInputFileBuffer)[0]\r
     if Process.returncode != 0:\r
       sys.exit(Process.returncode)\r
-      \r
+\r
     #\r
     # Write output file that contains hash GUID, Public Key, Signature, and Input data\r
-    #    \r
+    #\r
     args.OutputFile = open(args.OutputFileName, 'wb')\r
     args.OutputFile.write(EFI_HASH_ALGORITHM_SHA256_GUID.get_bytes_le())\r
     args.OutputFile.write(PublicKey)\r
@@ -198,7 +198,7 @@ if __name__ == '__main__':
     #\r
     Header = EFI_CERT_BLOCK_RSA_2048_SHA256._make(EFI_CERT_BLOCK_RSA_2048_SHA256_STRUCT.unpack_from(args.InputFileBuffer))\r
     args.InputFileBuffer = args.InputFileBuffer[EFI_CERT_BLOCK_RSA_2048_SHA256_STRUCT.size:]\r
-    \r
+\r
     #\r
     # Verify that the Hash Type matches the expected SHA256 type\r
     #\r
@@ -222,10 +222,10 @@ if __name__ == '__main__':
     # Write Signature to output file\r
     #\r
     open(args.OutputFileName, 'wb').write(Header.Signature)\r
-      \r
+\r
     #\r
     # Verify signature\r
-    #    \r
+    #\r
     Process = subprocess.Popen('%s dgst -sha256 -prverify "%s" -signature %s' % (OpenSslCommand, args.PrivateKeyFileName, args.OutputFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
     Process.communicate(input=FullInputFileBuffer)\r
     if Process.returncode != 0:\r
@@ -234,6 +234,6 @@ if __name__ == '__main__':
       sys.exit(Process.returncode)\r
 \r
     #\r
-    # Save output file contents from input file \r
-    #    \r
+    # Save output file contents from input file\r
+    #\r
     open(args.OutputFileName, 'wb').write(args.InputFileBuffer)\r