# on STDOUT.\r
# This tool has been tested with OpenSSL 1.0.1e 11 Feb 2013\r
#\r
-# Copyright (c) 2013 - 2014, 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
'''\r
Rsa2048Sha256GenerateKeys\r
'''\r
+from __future__ import print_function\r
\r
import os\r
import sys\r
import argparse \r
import subprocess\r
+from Common.BuildVersion import gBUILD_VERSION\r
+\r
+#\r
+# Globals for help information\r
+#\r
+__prog__ = 'Rsa2048Sha256GenerateKeys'\r
+__version__ = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)\r
+__copyright__ = 'Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.'\r
+__usage__ = '%s [options]' % (__prog__)\r
+\r
\r
if __name__ == '__main__':\r
- #\r
- # Save name of the program\r
- #\r
- ProgramName = sys.argv[0]\r
- \r
- #\r
- # Print copyright \r
- #\r
- print '%s - Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.' % (ProgramName)\r
- \r
#\r
# Create command line argument parser object\r
# \r
- parser = argparse.ArgumentParser(prog=ProgramName, usage='%(prog)s [options]', add_help=False)\r
+ parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')\r
group = parser.add_mutually_exclusive_group(required=True)\r
group.add_argument("-o", "--output", dest='OutputFile', type=argparse.FileType('wb'), metavar='filename', nargs='*', help="specify the output private key filename in PEM format")\r
group.add_argument("-i", "--input", dest='InputFile', type=argparse.FileType('rb'), metavar='filename', nargs='*', help="specify the input private key filename in PEM format")\r
parser.add_argument("-v", "--verbose", dest='Verbose', action="store_true", help="increase output messages")\r
parser.add_argument("-q", "--quiet", dest='Quiet', action="store_true", help="reduce output messages")\r
parser.add_argument("--debug", dest='Debug', type=int, metavar='[0-9]', choices=range(0,10), default=0, help="set debug level")\r
- parser.add_argument("--version", dest='Version', action="store_true", help="display the program version and exit")\r
- parser.add_argument("-h", "--help", dest='Help', action="help", help="display this help text")\r
\r
#\r
# Parse command line arguments\r
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
# Verify that Open SSL command is available\r
#\r
try:\r
- Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE)\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
#\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
+ 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
#\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
+ 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
#\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
- 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
# 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
projects / mirror_edk2.git / blobdiff