BaseTools: Replace StandardError with Expression

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

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
index df2d9896ca2661c49b0a8a2931eaaa2761ba3ea6..ca4f64864790cdc0d50ae88ffbc4dc971beabf6e 100644 (file)
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
@@ -9,7 +9,7 @@
 # on STDOUT.\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
@@ -22,6 +22,7 @@
 '''\r
 Rsa2048Sha256GenerateKeys\r
 '''\r
+from __future__ import print_function\r
 \r
 import os\r
 import sys\r
@@ -64,6 +65,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
@@ -73,21 +76,21 @@ 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
   args.PemFileName = []\r
   \r
   #\r
   # Check for output file argument\r
   #\r
-  if args.OutputFile <> None:\r
+  if args.OutputFile is not None:\r
     for Item in args.OutputFile:\r
       #\r
       # Save PEM filename and close output file\r
@@ -100,14 +103,14 @@ if __name__ == '__main__':
       #\r
       Process = subprocess.Popen('%s genrsa -out %s 2048' % (OpenSslCommand, Item.name), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
       Process.communicate()\r
-      if Process.returncode <> 0:\r
-        print 'ERROR: RSA 2048 key generation failed'\r
+      if Process.returncode != 0:\r
+        print('ERROR: RSA 2048 key generation failed')\r
         sys.exit(Process.returncode)\r
       \r
   #\r
   # Check for input file argument\r
   #\r
-  if args.InputFile <> None:\r
+  if args.InputFile is not None:\r
     for Item in args.InputFile:\r
       #\r
       # Save PEM filename and close input file\r
@@ -122,8 +125,8 @@ if __name__ == '__main__':
     #\r
     Process = subprocess.Popen('%s rsa -in %s -modulus -noout' % (OpenSslCommand, Item), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
     PublicKeyHexString = Process.communicate()[0].split('=')[1].strip()\r
-    if Process.returncode <> 0:\r
-      print 'ERROR: Unable to extract public key from private key'\r
+    if Process.returncode != 0:\r
+      print('ERROR: Unable to extract public key from private key')\r
       sys.exit(Process.returncode)\r
     PublicKey = ''\r
     for Index in range (0, len(PublicKeyHexString), 2):\r
@@ -135,8 +138,8 @@ if __name__ == '__main__':
     Process = subprocess.Popen('%s dgst -sha256 -binary' % (OpenSslCommand), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
     Process.stdin.write (PublicKey)\r
     PublicKeyHash = PublicKeyHash + Process.communicate()[0]\r
-    if Process.returncode <> 0:\r
-      print 'ERROR: Unable to extract SHA 256 hash of public key'\r
+    if Process.returncode != 0:\r
+      print('ERROR: Unable to extract SHA 256 hash of public key')\r
       sys.exit(Process.returncode)\r
 \r
   #\r
@@ -169,4 +172,4 @@ if __name__ == '__main__':
   # If verbose is enabled display the public key in C structure format\r
   #\r
   if args.Verbose:\r
-    print 'PublicKeySha256 = ' + PublicKeyHashC    \r
+    print('PublicKeySha256 = ' + PublicKeyHashC)\r