BaseTools: Clean up source files

1. Do not use tab characters 2. No trailing white space in one line 3. All files must end with CRLF Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao <liming.gao@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
2018-07-05 17:40:04 +08:00
parent 39456d00f3
commit f7496d7173
289 changed files with 10647 additions and 10647 deletions
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
@@ -1,11 +1,11 @@
 ## @file
-# This tool can be used to generate new RSA 2048 bit private/public key pairs 
-# in a PEM file format using OpenSSL command line utilities that are installed 
+# This tool can be used to generate new RSA 2048 bit private/public key pairs
+# in a PEM file format using OpenSSL command line utilities that are installed
 # on the path specified by the system environment variable OPENSSL_PATH.
-# This tool can also optionally write one or more SHA 256 hashes of 2048 bit 
-# public keys to a binary file, write one or more SHA 256 hashes of 2048 bit 
-# public keys to a file in a C structure format, and in verbose mode display 
-# one or more SHA 256 hashes of 2048 bit public keys in a C structure format 
+# This tool can also optionally write one or more SHA 256 hashes of 2048 bit
+# public keys to a binary file, write one or more SHA 256 hashes of 2048 bit
+# public keys to a file in a C structure format, and in verbose mode display
+# one or more SHA 256 hashes of 2048 bit public keys in a C structure format
 # on STDOUT.
 # This tool has been tested with OpenSSL 1.0.1e 11 Feb 2013
 #
@@ -26,7 +26,7 @@ from __future__ import print_function

 import os
 import sys
-import argparse 
+import argparse
 import subprocess
 from Common.BuildVersion import gBUILD_VERSION

@@ -35,14 +35,14 @@ from Common.BuildVersion import gBUILD_VERSION
 #
 __prog__      = 'Rsa2048Sha256GenerateKeys'
 __version__   = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)
-__copyright__ = 'Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.'
+__copyright__ = 'Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.'
 __usage__     = '%s [options]' % (__prog__)


 if __name__ == '__main__':
  #
  # Create command line argument parser object
-  #  
+  #
  parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
  group = parser.add_mutually_exclusive_group(required=True)
  group.add_argument("-o", "--output", dest='OutputFile', type=argparse.FileType('wb'), metavar='filename', nargs='*', help="specify the output private key filename in PEM format")
@@ -55,7 +55,7 @@ if __name__ == '__main__':

  #
  # Parse command line arguments
-  #  
+  #
  args = parser.parse_args()

  #
@@ -75,18 +75,18 @@ if __name__ == '__main__':
  #
  try:
    Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-  except:  
+  except:
    print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')
    sys.exit(1)
-    
+
  Version = Process.communicate()
  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])
-  
+
  args.PemFileName = []
-  
+
  #
  # Check for output file argument
  #
@@ -106,7 +106,7 @@ if __name__ == '__main__':
      if Process.returncode != 0:
        print('ERROR: RSA 2048 key generation failed')
        sys.exit(Process.returncode)
-      
+
  #
  # Check for input file argument
  #
@@ -158,7 +158,7 @@ if __name__ == '__main__':
  for Item in PublicKeyHash:
    PublicKeyHashC = PublicKeyHashC + '0x%02x, ' % (ord(Item))
  PublicKeyHashC = PublicKeyHashC[:-2] + '}'
-  
+
  #
  # Write SHA 256 of 2048 bit binary public key to public key hash C structure file
  #
@@ -167,7 +167,7 @@ if __name__ == '__main__':
    args.PublicKeyHashCFile.close ()
  except:
    pass
-    
+
  #
  # If verbose is enabled display the public key in C structure format
  #
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
@@ -21,7 +21,7 @@ from __future__ import print_function

 import os
 import sys
-import argparse 
+import argparse
 import subprocess
 import uuid
 import struct
@@ -33,7 +33,7 @@ from Common.BuildVersion import gBUILD_VERSION
 #
 __prog__      = 'Rsa2048Sha256Sign'
 __version__   = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)
-__copyright__ = 'Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.'
+__copyright__ = 'Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.'
 __usage__     = '%s -e|-d [options] <input_file>' % (__prog__)

 #
@@ -61,7 +61,7 @@ TEST_SIGNING_PRIVATE_KEY_FILENAME = 'TestSigningPrivateKey.pem'
 if __name__ == '__main__':
  #
  # Create command line argument parser object
-  #  
+  #
  parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
  group = parser.add_mutually_exclusive_group(required=True)
  group.add_argument("-e", action="store_true", dest='Encode', help='encode file')
@@ -76,7 +76,7 @@ if __name__ == '__main__':

  #
  # Parse command line arguments
-  #  
+  #
  args = parser.parse_args()

  #
@@ -96,19 +96,19 @@ if __name__ == '__main__':
  #
  try:
    Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-  except:  
+  except:
    print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')
    sys.exit(1)
-    
+
  Version = Process.communicate()
  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])
-  
+
  #
  # Read input file into a buffer and save input filename
-  #  
+  #
  args.InputFileName   = args.InputFile.name
  args.InputFileBuffer = args.InputFile.read()
  args.InputFile.close()
@@ -174,17 +174,17 @@ if __name__ == '__main__':
    if args.MonotonicCountStr:
      format = "%dsQ" % len(args.InputFileBuffer)
      FullInputFileBuffer = struct.pack(format, args.InputFileBuffer, args.MonotonicCountValue)
-    # 
+    #
    # Sign the input file using the specified private key and capture signature from STDOUT
    #
    Process = subprocess.Popen('%s dgst -sha256 -sign "%s"' % (OpenSslCommand, args.PrivateKeyFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
    Signature = Process.communicate(input=FullInputFileBuffer)[0]
    if Process.returncode != 0:
      sys.exit(Process.returncode)
-      
+
    #
    # Write output file that contains hash GUID, Public Key, Signature, and Input data
-    #    
+    #
    args.OutputFile = open(args.OutputFileName, 'wb')
    args.OutputFile.write(EFI_HASH_ALGORITHM_SHA256_GUID.get_bytes_le())
    args.OutputFile.write(PublicKey)
@@ -198,7 +198,7 @@ if __name__ == '__main__':
    #
    Header = EFI_CERT_BLOCK_RSA_2048_SHA256._make(EFI_CERT_BLOCK_RSA_2048_SHA256_STRUCT.unpack_from(args.InputFileBuffer))
    args.InputFileBuffer = args.InputFileBuffer[EFI_CERT_BLOCK_RSA_2048_SHA256_STRUCT.size:]
-    
+
    #
    # Verify that the Hash Type matches the expected SHA256 type
    #
@@ -222,10 +222,10 @@ if __name__ == '__main__':
    # Write Signature to output file
    #
    open(args.OutputFileName, 'wb').write(Header.Signature)
-      
+
    #
    # Verify signature
-    #    
+    #
    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)
    Process.communicate(input=FullInputFileBuffer)
    if Process.returncode != 0:
@@ -234,6 +234,6 @@ if __name__ == '__main__':
      sys.exit(Process.returncode)

    #
-    # Save output file contents from input file 
-    #    
+    # Save output file contents from input file
+    #
    open(args.OutputFileName, 'wb').write(args.InputFileBuffer)
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/TestSigningPublicKey.txt
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/TestSigningPublicKey.txt
@@ -1 +1 @@
-{0x91, 0x29, 0xc4, 0xbd, 0xea, 0x6d, 0xda, 0xb3, 0xaa, 0x6f, 0x50, 0x16, 0xfc, 0xdb, 0x4b, 0x7e, 0x3c, 0xd6, 0xdc, 0xa4, 0x7a, 0x0e, 0xdd, 0xe6, 0x15, 0x8c, 0x73, 0x96, 0xa2, 0xd4, 0xa6, 0x4d}
+{0x91, 0x29, 0xc4, 0xbd, 0xea, 0x6d, 0xda, 0xb3, 0xaa, 0x6f, 0x50, 0x16, 0xfc, 0xdb, 0x4b, 0x7e, 0x3c, 0xd6, 0xdc, 0xa4, 0x7a, 0x0e, 0xdd, 0xe6, 0x15, 0x8c, 0x73, 0x96, 0xa2, 0xd4, 0xa6, 0x4d}