BaseTools: Refactor python print statements
Refactor print statements to be compatible with python 3. Based on "futurize -f libfuturize.fixes.fix_print_with_import" Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Gary Lin <glin@suse.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
'''
|
||||
Rsa2048Sha256GenerateKeys
|
||||
'''
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
@@ -75,14 +76,14 @@ if __name__ == '__main__':
|
||||
try:
|
||||
Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
except:
|
||||
print 'ERROR: Open SSL command not available. Please verify PATH or set OPENSSL_PATH'
|
||||
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'
|
||||
print('ERROR: Open SSL command not available. Please verify PATH or set OPENSSL_PATH')
|
||||
sys.exit(Process.returncode)
|
||||
print Version[0]
|
||||
print(Version[0])
|
||||
|
||||
args.PemFileName = []
|
||||
|
||||
@@ -103,7 +104,7 @@ if __name__ == '__main__':
|
||||
Process = subprocess.Popen('%s genrsa -out %s 2048' % (OpenSslCommand, Item.name), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
Process.communicate()
|
||||
if Process.returncode <> 0:
|
||||
print 'ERROR: RSA 2048 key generation failed'
|
||||
print('ERROR: RSA 2048 key generation failed')
|
||||
sys.exit(Process.returncode)
|
||||
|
||||
#
|
||||
@@ -125,7 +126,7 @@ if __name__ == '__main__':
|
||||
Process = subprocess.Popen('%s rsa -in %s -modulus -noout' % (OpenSslCommand, Item), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
PublicKeyHexString = Process.communicate()[0].split('=')[1].strip()
|
||||
if Process.returncode <> 0:
|
||||
print 'ERROR: Unable to extract public key from private key'
|
||||
print('ERROR: Unable to extract public key from private key')
|
||||
sys.exit(Process.returncode)
|
||||
PublicKey = ''
|
||||
for Index in range (0, len(PublicKeyHexString), 2):
|
||||
@@ -138,7 +139,7 @@ if __name__ == '__main__':
|
||||
Process.stdin.write (PublicKey)
|
||||
PublicKeyHash = PublicKeyHash + Process.communicate()[0]
|
||||
if Process.returncode <> 0:
|
||||
print 'ERROR: Unable to extract SHA 256 hash of public key'
|
||||
print('ERROR: Unable to extract SHA 256 hash of public key')
|
||||
sys.exit(Process.returncode)
|
||||
|
||||
#
|
||||
@@ -171,4 +172,4 @@ if __name__ == '__main__':
|
||||
# If verbose is enabled display the public key in C structure format
|
||||
#
|
||||
if args.Verbose:
|
||||
print 'PublicKeySha256 = ' + PublicKeyHashC
|
||||
print('PublicKeySha256 = ' + PublicKeyHashC)
|
||||
|
@@ -17,6 +17,7 @@
|
||||
'''
|
||||
Rsa2048Sha256Sign
|
||||
'''
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
@@ -96,14 +97,14 @@ if __name__ == '__main__':
|
||||
try:
|
||||
Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
except:
|
||||
print 'ERROR: Open SSL command not available. Please verify PATH or set OPENSSL_PATH'
|
||||
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'
|
||||
print('ERROR: Open SSL command not available. Please verify PATH or set OPENSSL_PATH')
|
||||
sys.exit(Process.returncode)
|
||||
print Version[0]
|
||||
print(Version[0])
|
||||
|
||||
#
|
||||
# Read input file into a buffer and save input filename
|
||||
@@ -117,7 +118,7 @@ if __name__ == '__main__':
|
||||
#
|
||||
OutputDir = os.path.dirname(args.OutputFile)
|
||||
if not os.path.exists(OutputDir):
|
||||
print 'ERROR: The output path does not exist: %s' % OutputDir
|
||||
print('ERROR: The output path does not exist: %s' % OutputDir)
|
||||
sys.exit(1)
|
||||
args.OutputFileName = args.OutputFile
|
||||
|
||||
@@ -144,7 +145,7 @@ if __name__ == '__main__':
|
||||
args.PrivateKeyFile = open(args.PrivateKeyFileName, 'rb')
|
||||
args.PrivateKeyFile.close()
|
||||
except:
|
||||
print 'ERROR: test signing private key file %s missing' % (args.PrivateKeyFileName)
|
||||
print('ERROR: test signing private key file %s missing' % (args.PrivateKeyFileName))
|
||||
sys.exit(1)
|
||||
|
||||
#
|
||||
@@ -202,14 +203,14 @@ if __name__ == '__main__':
|
||||
# Verify that the Hash Type matches the expected SHA256 type
|
||||
#
|
||||
if uuid.UUID(bytes_le = Header.HashType) <> EFI_HASH_ALGORITHM_SHA256_GUID:
|
||||
print 'ERROR: unsupport hash GUID'
|
||||
print('ERROR: unsupport hash GUID')
|
||||
sys.exit(1)
|
||||
|
||||
#
|
||||
# Verify the public key
|
||||
#
|
||||
if Header.PublicKey <> PublicKey:
|
||||
print 'ERROR: Public key in input file does not match public key from private key file'
|
||||
print('ERROR: Public key in input file does not match public key from private key file')
|
||||
sys.exit(1)
|
||||
|
||||
FullInputFileBuffer = args.InputFileBuffer
|
||||
@@ -228,7 +229,7 @@ if __name__ == '__main__':
|
||||
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:
|
||||
print 'ERROR: Verification failed'
|
||||
print('ERROR: Verification failed')
|
||||
os.remove (args.OutputFileName)
|
||||
sys.exit(Process.returncode)
|
||||
|
||||
|
Reference in New Issue
Block a user