BaseTools: fix None comparisons

[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 2dd6c201683334cb6a82b28f75bf16d249e7172d..9711de8f5c2eb2d58ac255cca25ca9a9402b165b 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
@@ -64,6 +64,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
@@ -87,7 +89,7 @@ if __name__ == '__main__':
   #\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
@@ -98,7 +100,7 @@ if __name__ == '__main__':
       #\r
       # Generate private key and save it to output file in a PEM file format\r
       #\r
-      Process = subprocess.Popen('%s genrsa -out %s 2048' % (OpenSslCommand, Item.name), stdout=subprocess.PIPE, stderr=subprocess.PIPE)\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
@@ -107,7 +109,7 @@ if __name__ == '__main__':
   #\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
@@ -120,7 +122,7 @@ if __name__ == '__main__':
     #\r
     # Extract public key from private key into STDOUT\r
     #\r
-    Process = subprocess.Popen('%s rsa -in %s -modulus -noout' % (OpenSslCommand, Item), stdout=subprocess.PIPE, stderr=subprocess.PIPE)\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
@@ -132,7 +134,7 @@ if __name__ == '__main__':
     #\r
     # Generate SHA 256 hash of RSA 2048 bit public key into STDOUT\r
     #\r
-    Process = subprocess.Popen('%s dgst -sha256 -binary' % (OpenSslCommand), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
+    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