#\r
# This tool has been tested with OpenSSL.\r
#\r
-# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2016 - 2017, 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
Pkcs7Sign\r
'''\r
+from __future__ import print_function\r
\r
import os\r
import sys\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
#\r
# Read input file into a buffer and save input filename\r
#\r
OutputDir = os.path.dirname(args.OutputFile)\r
if not os.path.exists(OutputDir):\r
- print 'ERROR: The output path does not exist: %s' % OutputDir\r
+ print('ERROR: The output path does not exist: %s' % OutputDir)\r
sys.exit(1)\r
args.OutputFileName = args.OutputFile\r
\r
args.SignerPrivateCertFile = open(args.SignerPrivateCertFileName, 'rb')\r
args.SignerPrivateCertFile.close()\r
except:\r
- print 'ERROR: test signer private cert file %s missing' % (args.SignerPrivateCertFileName)\r
+ print('ERROR: test signer private cert file %s missing' % (args.SignerPrivateCertFileName))\r
sys.exit(1)\r
\r
#\r
args.OtherPublicCertFile = open(args.OtherPublicCertFileName, 'rb')\r
args.OtherPublicCertFile.close()\r
except:\r
- print 'ERROR: test other public cert file %s missing' % (args.OtherPublicCertFileName)\r
+ print('ERROR: test other public cert file %s missing' % (args.OtherPublicCertFileName))\r
sys.exit(1)\r
\r
- format = "Q%ds" % len(args.InputFileBuffer)\r
- FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)\r
+ format = "%dsQ" % len(args.InputFileBuffer)\r
+ FullInputFileBuffer = struct.pack(format, args.InputFileBuffer, args.MonotonicCountValue)\r
\r
#\r
# Sign the input file using the specified private key and capture signature from STDOUT\r
#\r
- Process = subprocess.Popen('%s smime -sign -binary -signer "%s" -outform DER -md sha256 -certfile "%s"' % (OpenSslCommand, args.SignerPrivateCertFileName, args.OtherPublicCertFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
+ Process = subprocess.Popen('%s smime -sign -binary -signer "%s" -outform DER -md sha256 -certfile "%s"' % (OpenSslCommand, args.SignerPrivateCertFileName, args.OtherPublicCertFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
Signature = Process.communicate(input=FullInputFileBuffer)[0]\r
- if Process.returncode <> 0:\r
+ if Process.returncode != 0:\r
sys.exit(Process.returncode)\r
\r
#\r
args.TrustedPublicCertFile = open(args.TrustedPublicCertFileName, 'rb')\r
args.TrustedPublicCertFile.close()\r
except:\r
- print 'ERROR: test trusted public cert file %s missing' % (args.TrustedPublicCertFileName)\r
+ print('ERROR: test trusted public cert file %s missing' % (args.TrustedPublicCertFileName))\r
sys.exit(1)\r
\r
if not args.SignatureSizeStr:\r
- print "ERROR: please use the option --signature-size to specify the size of the signature data!"\r
+ print("ERROR: please use the option --signature-size to specify the size of the signature data!")\r
sys.exit(1)\r
else:\r
if args.SignatureSizeStr.upper().startswith('0X'):\r
else:\r
SignatureSize = (long)(args.SignatureSizeStr)\r
if SignatureSize < 0:\r
- print "ERROR: The value of option --signature-size can't be set to negative value!"\r
+ print("ERROR: The value of option --signature-size can't be set to negative value!")\r
sys.exit(1)\r
elif SignatureSize > len(args.InputFileBuffer):\r
- print "ERROR: The value of option --signature-size is exceed the size of the input file !"\r
+ print("ERROR: The value of option --signature-size is exceed the size of the input file !")\r
sys.exit(1)\r
\r
args.SignatureBuffer = args.InputFileBuffer[0:SignatureSize]\r
args.InputFileBuffer = args.InputFileBuffer[SignatureSize:]\r
\r
- format = "Q%ds" % len(args.InputFileBuffer)\r
- FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)\r
+ format = "%dsQ" % len(args.InputFileBuffer)\r
+ FullInputFileBuffer = struct.pack(format, args.InputFileBuffer, args.MonotonicCountValue)\r
\r
#\r
# Save output file contents from input file\r
#\r
# Verify signature\r
#\r
- Process = subprocess.Popen('%s smime -verify -inform DER -content %s -CAfile %s' % (OpenSslCommand, args.OutputFileName, args.TrustedPublicCertFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
+ Process = subprocess.Popen('%s smime -verify -inform DER -content %s -CAfile %s' % (OpenSslCommand, args.OutputFileName, args.TrustedPublicCertFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
Process.communicate(input=args.SignatureBuffer)[0]\r
- if Process.returncode <> 0:\r
- print 'ERROR: Verification failed'\r
+ if Process.returncode != 0:\r
+ print('ERROR: Verification failed')\r
os.remove (args.OutputFileName)\r
sys.exit(Process.returncode)\r
\r