# This tool has been tested with OpenSSL 1.0.1e 11 Feb 2013\r
#\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
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
\r
'''\r
EFI_HASH_ALGORITHM_SHA256_GUID = uuid.UUID('{51aa59de-fdf2-4ea3-bc63-875fb7842ee9}')\r
\r
#\r
-# Structure defintion to unpack EFI_CERT_BLOCK_RSA_2048_SHA256 from UEFI 2.4 Specification\r
+# Structure definition to unpack EFI_CERT_BLOCK_RSA_2048_SHA256 from UEFI 2.4 Specification\r
#\r
# typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {\r
# EFI_GUID HashType;\r
#\r
# Create command line argument parser object\r
#\r
- parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')\r
+ parser = argparse.ArgumentParser(prog=__prog__, usage=__usage__, description=__copyright__, conflict_handler='resolve')\r
group = parser.add_mutually_exclusive_group(required=True)\r
group.add_argument("-e", action="store_true", dest='Encode', help='encode file')\r
group.add_argument("-d", action="store_true", dest='Decode', help='decode file')\r
+ group.add_argument("--version", action='version', version=__version__)\r
parser.add_argument("-o", "--output", dest='OutputFile', type=str, metavar='filename', help="specify the output filename", required=True)\r
parser.add_argument("--monotonic-count", dest='MonotonicCountStr', type=str, help="specify the MonotonicCount in FMP capsule.")\r
parser.add_argument("--private-key", dest='PrivateKeyFile', type=argparse.FileType('rb'), help="specify the private key filename. If not specified, a test signing key is used.")\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].decode('utf-8'))\r
\r
#\r
# Read input file into a buffer and save input filename\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, shell=True)\r
- PublicKeyHexString = Process.communicate()[0].split('=')[1].strip()\r
+ PublicKeyHexString = Process.communicate()[0].split(b'=')[1].strip()\r
+ PublicKeyHexString = PublicKeyHexString.decode('utf-8')\r
PublicKey = ''\r
while len(PublicKeyHexString) > 0:\r
- PublicKey = PublicKey + chr(int(PublicKeyHexString[0:2], 16))\r
+ PublicKey = PublicKey + PublicKeyHexString[0:2]\r
PublicKeyHexString=PublicKeyHexString[2:]\r
if Process.returncode != 0:\r
sys.exit(Process.returncode)\r
if args.MonotonicCountStr:\r
try:\r
if args.MonotonicCountStr.upper().startswith('0X'):\r
- args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16)\r
+ args.MonotonicCountValue = int(args.MonotonicCountStr, 16)\r
else:\r
- args.MonotonicCountValue = (long)(args.MonotonicCountStr)\r
+ args.MonotonicCountValue = int(args.MonotonicCountStr)\r
except:\r
pass\r
\r
# Write output file that contains hash GUID, Public Key, Signature, and Input data\r
#\r
args.OutputFile = open(args.OutputFileName, 'wb')\r
- args.OutputFile.write(EFI_HASH_ALGORITHM_SHA256_GUID.get_bytes_le())\r
- args.OutputFile.write(PublicKey)\r
+ args.OutputFile.write(EFI_HASH_ALGORITHM_SHA256_GUID.bytes_le)\r
+ args.OutputFile.write(bytearray.fromhex(str(PublicKey)))\r
args.OutputFile.write(Signature)\r
args.OutputFile.write(args.InputFileBuffer)\r
args.OutputFile.close()\r
#\r
# Verify the public key\r
#\r
- if Header.PublicKey != PublicKey:\r
+ if Header.PublicKey != bytearray.fromhex(PublicKey):\r
print('ERROR: Public key in input file does not match public key from private key file')\r
sys.exit(1)\r
\r