BaseTools: Replace StandardError with Expression

[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 952583cf4bb00fa2ef67b15d04c7c328df94bccd..2e164c4a2da6c319753a2396dc4962668f568f4f 100644 (file)
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
@@ -4,7 +4,7 @@
 #   {0xa7717414, 0xc616, 0x4977, {0x94, 0x20, 0x84, 0x47, 0x12, 0xa7, 0x35, 0xbf}}\r
 # This tool has been tested with OpenSSL 1.0.1e 11 Feb 2013\r
 #\r
-# Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,6 +17,7 @@
 '''\r
 Rsa2048Sha256Sign\r
 '''\r
+from __future__ import print_function\r
 \r
 import os\r
 import sys\r
@@ -85,6 +86,8 @@ if __name__ == '__main__':
   try:\r
     OpenSslPath = os.environ['OPENSSL_PATH']\r
     OpenSslCommand = os.path.join(OpenSslPath, OpenSslCommand)\r
+    if ' ' in OpenSslCommand:\r
+      OpenSslCommand = '"' + OpenSslCommand + '"'\r
   except:\r
     pass\r
 \r
@@ -94,14 +97,14 @@ if __name__ == '__main__':
   try:\r
     Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
   except:  \r
-    print 'ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH'\r
+    print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')\r
     sys.exit(1)\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
+  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
+  print(Version[0])\r
   \r
   #\r
   # Read input file into a buffer and save input filename\r
@@ -115,7 +118,7 @@ if __name__ == '__main__':
   #\r
   OutputDir = os.path.dirname(args.OutputFile)\r
   if not os.path.exists(OutputDir):\r
-    print 'ERROR: The output path does not exist: %s' % OutputDir\r
+    print('ERROR: The output path does not exist: %s' % OutputDir)\r
     sys.exit(1)\r
   args.OutputFileName = args.OutputFile\r
 \r
@@ -142,19 +145,19 @@ if __name__ == '__main__':
       args.PrivateKeyFile = open(args.PrivateKeyFileName, 'rb')\r
       args.PrivateKeyFile.close()\r
     except:\r
-      print 'ERROR: test signing private key file %s missing' % (args.PrivateKeyFileName)\r
+      print('ERROR: test signing private key file %s missing' % (args.PrivateKeyFileName))\r
       sys.exit(1)\r
 \r
   #\r
   # Extract public key from private key into STDOUT\r
   #\r
-  Process = subprocess.Popen('%s rsa -in "%s" -modulus -noout' % (OpenSslCommand, args.PrivateKeyFileName), stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
+  Process = subprocess.Popen('%s rsa -in "%s" -modulus -noout' % (OpenSslCommand, args.PrivateKeyFileName), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
   PublicKeyHexString = Process.communicate()[0].split('=')[1].strip()\r
   PublicKey = ''\r
   while len(PublicKeyHexString) > 0:\r
     PublicKey = PublicKey + chr(int(PublicKeyHexString[0:2],16))\r
     PublicKeyHexString=PublicKeyHexString[2:]\r
-  if Process.returncode <> 0:\r
+  if Process.returncode != 0:\r
     sys.exit(Process.returncode)\r
 \r
   if args.MonotonicCountStr:\r
@@ -174,9 +177,9 @@ if __name__ == '__main__':
     # \r
     # Sign the input file using the specified private key and capture signature from STDOUT\r
     #\r
-    Process = subprocess.Popen('%s sha256 -sign "%s"' % (OpenSslCommand, args.PrivateKeyFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\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
+    if Process.returncode != 0:\r
       sys.exit(Process.returncode)\r
       \r
     #\r
@@ -199,15 +202,15 @@ if __name__ == '__main__':
     #\r
     # Verify that the Hash Type matches the expected SHA256 type\r
     #\r
-    if uuid.UUID(bytes_le = Header.HashType) <> EFI_HASH_ALGORITHM_SHA256_GUID:\r
-      print 'ERROR: unsupport hash GUID'\r
+    if uuid.UUID(bytes_le = Header.HashType) != EFI_HASH_ALGORITHM_SHA256_GUID:\r
+      print('ERROR: unsupport hash GUID')\r
       sys.exit(1)\r
 \r
     #\r
     # Verify the public key\r
     #\r
-    if Header.PublicKey <> PublicKey:\r
-      print 'ERROR: Public key in input file does not match public key from private key file'\r
+    if Header.PublicKey != PublicKey:\r
+      print('ERROR: Public key in input file does not match public key from private key file')\r
       sys.exit(1)\r
 \r
     FullInputFileBuffer = args.InputFileBuffer\r
@@ -223,10 +226,10 @@ if __name__ == '__main__':
     #\r
     # Verify signature\r
     #    \r
-    Process = subprocess.Popen('%s sha256 -prverify "%s" -signature %s' % (OpenSslCommand, args.PrivateKeyFileName, args.OutputFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\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
-      print 'ERROR: Verification failed'\r
+    if Process.returncode != 0:\r
+      print('ERROR: Verification failed')\r
       os.remove (args.OutputFileName)\r
       sys.exit(Process.returncode)\r
 \r