BaseTools: Change source files to DOS format
Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu
@ -2770,13 +2770,13 @@ Returns:
|
|||||||
//
|
//
|
||||||
// Update reset vector (SALE_ENTRY for IPF)
|
// Update reset vector (SALE_ENTRY for IPF)
|
||||||
// Now for IA32 and IA64 platform, the fv which has bsf file must have the
|
// Now for IA32 and IA64 platform, the fv which has bsf file must have the
|
||||||
// EndAddress of 0xFFFFFFFF (unless the section was rebased).
|
// EndAddress of 0xFFFFFFFF (unless the section was rebased).
|
||||||
// Thus, only this type fv needs to update the reset vector.
|
// Thus, only this type fv needs to update the reset vector.
|
||||||
// If the PEI Core is found, the VTF file will probably get
|
// If the PEI Core is found, the VTF file will probably get
|
||||||
// corrupted by updating the entry point.
|
// corrupted by updating the entry point.
|
||||||
//
|
//
|
||||||
if (mFvDataInfo.ForceRebase == 1 ||
|
if (mFvDataInfo.ForceRebase == 1 ||
|
||||||
(mFvDataInfo.BaseAddress + mFvDataInfo.Size) == FV_IMAGES_TOP_ADDRESS) {
|
(mFvDataInfo.BaseAddress + mFvDataInfo.Size) == FV_IMAGES_TOP_ADDRESS) {
|
||||||
Status = UpdateResetVector (&FvImageMemoryFile, &mFvDataInfo, VtfFileImage);
|
Status = UpdateResetVector (&FvImageMemoryFile, &mFvDataInfo, VtfFileImage);
|
||||||
if (EFI_ERROR(Status)) {
|
if (EFI_ERROR(Status)) {
|
||||||
Error (NULL, 0, 3000, "Invalid", "Could not update the reset vector.");
|
Error (NULL, 0, 3000, "Invalid", "Could not update the reset vector.");
|
||||||
|
|||||||
@ -1,282 +1,282 @@
|
|||||||
## @file
|
## @file
|
||||||
# This tool adds EFI_FIRMWARE_IMAGE_AUTHENTICATION for a binary.
|
# This tool adds EFI_FIRMWARE_IMAGE_AUTHENTICATION for a binary.
|
||||||
#
|
#
|
||||||
# This tool only support CertType - EFI_CERT_TYPE_PKCS7_GUID
|
# This tool only support CertType - EFI_CERT_TYPE_PKCS7_GUID
|
||||||
# {0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7}}
|
# {0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7}}
|
||||||
#
|
#
|
||||||
# This tool has been tested with OpenSSL.
|
# This tool has been tested with OpenSSL.
|
||||||
#
|
#
|
||||||
# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
|
# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
|
||||||
# This program and the accompanying materials
|
# This program and the accompanying materials
|
||||||
# are licensed and made available under the terms and conditions of the BSD License
|
# are licensed and made available under the terms and conditions of the BSD License
|
||||||
# which accompanies this distribution. The full text of the license may be found at
|
# which accompanies this distribution. The full text of the license may be found at
|
||||||
# http://opensource.org/licenses/bsd-license.php
|
# http://opensource.org/licenses/bsd-license.php
|
||||||
#
|
#
|
||||||
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||||
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||||
#
|
#
|
||||||
|
|
||||||
'''
|
'''
|
||||||
Pkcs7Sign
|
Pkcs7Sign
|
||||||
'''
|
'''
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import argparse
|
import argparse
|
||||||
import subprocess
|
import subprocess
|
||||||
import uuid
|
import uuid
|
||||||
import struct
|
import struct
|
||||||
import collections
|
import collections
|
||||||
from Common.BuildVersion import gBUILD_VERSION
|
from Common.BuildVersion import gBUILD_VERSION
|
||||||
|
|
||||||
#
|
#
|
||||||
# Globals for help information
|
# Globals for help information
|
||||||
#
|
#
|
||||||
__prog__ = 'Pkcs7Sign'
|
__prog__ = 'Pkcs7Sign'
|
||||||
__version__ = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)
|
__version__ = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)
|
||||||
__copyright__ = 'Copyright (c) 2016, Intel Corporation. All rights reserved.'
|
__copyright__ = 'Copyright (c) 2016, Intel Corporation. All rights reserved.'
|
||||||
__usage__ = '%s -e|-d [options] <input_file>' % (__prog__)
|
__usage__ = '%s -e|-d [options] <input_file>' % (__prog__)
|
||||||
|
|
||||||
#
|
#
|
||||||
# GUID for PKCS7 from UEFI Specification
|
# GUID for PKCS7 from UEFI Specification
|
||||||
#
|
#
|
||||||
WIN_CERT_REVISION = 0x0200
|
WIN_CERT_REVISION = 0x0200
|
||||||
WIN_CERT_TYPE_EFI_GUID = 0x0EF1
|
WIN_CERT_TYPE_EFI_GUID = 0x0EF1
|
||||||
EFI_CERT_TYPE_PKCS7_GUID = uuid.UUID('{4aafd29d-68df-49ee-8aa9-347d375665a7}')
|
EFI_CERT_TYPE_PKCS7_GUID = uuid.UUID('{4aafd29d-68df-49ee-8aa9-347d375665a7}')
|
||||||
|
|
||||||
#
|
#
|
||||||
# typedef struct _WIN_CERTIFICATE {
|
# typedef struct _WIN_CERTIFICATE {
|
||||||
# UINT32 dwLength;
|
# UINT32 dwLength;
|
||||||
# UINT16 wRevision;
|
# UINT16 wRevision;
|
||||||
# UINT16 wCertificateType;
|
# UINT16 wCertificateType;
|
||||||
# //UINT8 bCertificate[ANYSIZE_ARRAY];
|
# //UINT8 bCertificate[ANYSIZE_ARRAY];
|
||||||
# } WIN_CERTIFICATE;
|
# } WIN_CERTIFICATE;
|
||||||
#
|
#
|
||||||
# typedef struct _WIN_CERTIFICATE_UEFI_GUID {
|
# typedef struct _WIN_CERTIFICATE_UEFI_GUID {
|
||||||
# WIN_CERTIFICATE Hdr;
|
# WIN_CERTIFICATE Hdr;
|
||||||
# EFI_GUID CertType;
|
# EFI_GUID CertType;
|
||||||
# //UINT8 CertData[ANYSIZE_ARRAY];
|
# //UINT8 CertData[ANYSIZE_ARRAY];
|
||||||
# } WIN_CERTIFICATE_UEFI_GUID;
|
# } WIN_CERTIFICATE_UEFI_GUID;
|
||||||
#
|
#
|
||||||
# typedef struct {
|
# typedef struct {
|
||||||
# UINT64 MonotonicCount;
|
# UINT64 MonotonicCount;
|
||||||
# WIN_CERTIFICATE_UEFI_GUID AuthInfo;
|
# WIN_CERTIFICATE_UEFI_GUID AuthInfo;
|
||||||
# } EFI_FIRMWARE_IMAGE_AUTHENTICATION;
|
# } EFI_FIRMWARE_IMAGE_AUTHENTICATION;
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# Filename of test signing private cert that is stored in same directory as this tool
|
# Filename of test signing private cert that is stored in same directory as this tool
|
||||||
#
|
#
|
||||||
TEST_SIGNER_PRIVATE_CERT_FILENAME = 'TestCert.pem'
|
TEST_SIGNER_PRIVATE_CERT_FILENAME = 'TestCert.pem'
|
||||||
TEST_OTHER_PUBLIC_CERT_FILENAME = 'TestSub.pub.pem'
|
TEST_OTHER_PUBLIC_CERT_FILENAME = 'TestSub.pub.pem'
|
||||||
TEST_TRUSTED_PUBLIC_CERT_FILENAME = 'TestRoot.pub.pem'
|
TEST_TRUSTED_PUBLIC_CERT_FILENAME = 'TestRoot.pub.pem'
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
#
|
#
|
||||||
# Create command line argument parser object
|
# Create command line argument parser object
|
||||||
#
|
#
|
||||||
parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
|
parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
|
||||||
group = parser.add_mutually_exclusive_group(required=True)
|
group = parser.add_mutually_exclusive_group(required=True)
|
||||||
group.add_argument("-e", action="store_true", dest='Encode', help='encode file')
|
group.add_argument("-e", action="store_true", dest='Encode', help='encode file')
|
||||||
group.add_argument("-d", action="store_true", dest='Decode', help='decode file')
|
group.add_argument("-d", action="store_true", dest='Decode', help='decode file')
|
||||||
parser.add_argument("-o", "--output", dest='OutputFile', type=str, metavar='filename', help="specify the output filename", required=True)
|
parser.add_argument("-o", "--output", dest='OutputFile', type=str, metavar='filename', help="specify the output filename", required=True)
|
||||||
parser.add_argument("--signer-private-cert", dest='SignerPrivateCertFile', type=argparse.FileType('rb'), help="specify the signer private cert filename. If not specified, a test signer private cert is used.")
|
parser.add_argument("--signer-private-cert", dest='SignerPrivateCertFile', type=argparse.FileType('rb'), help="specify the signer private cert filename. If not specified, a test signer private cert is used.")
|
||||||
parser.add_argument("--other-public-cert", dest='OtherPublicCertFile', type=argparse.FileType('rb'), help="specify the other public cert filename. If not specified, a test other public cert is used.")
|
parser.add_argument("--other-public-cert", dest='OtherPublicCertFile', type=argparse.FileType('rb'), help="specify the other public cert filename. If not specified, a test other public cert is used.")
|
||||||
parser.add_argument("--trusted-public-cert", dest='TrustedPublicCertFile', type=argparse.FileType('rb'), help="specify the trusted public cert filename. If not specified, a test trusted public cert is used.")
|
parser.add_argument("--trusted-public-cert", dest='TrustedPublicCertFile', type=argparse.FileType('rb'), help="specify the trusted public cert filename. If not specified, a test trusted public cert is used.")
|
||||||
parser.add_argument("--monotonic-count", dest='MonotonicCountStr', type=str, help="specify the MonotonicCount in FMP capsule. If not specified, 0 is used.")
|
parser.add_argument("--monotonic-count", dest='MonotonicCountStr', type=str, help="specify the MonotonicCount in FMP capsule. If not specified, 0 is used.")
|
||||||
parser.add_argument("--signature-size", dest='SignatureSizeStr', type=str, help="specify the signature size for decode process.")
|
parser.add_argument("--signature-size", dest='SignatureSizeStr', type=str, help="specify the signature size for decode process.")
|
||||||
parser.add_argument("-v", "--verbose", dest='Verbose', action="store_true", help="increase output messages")
|
parser.add_argument("-v", "--verbose", dest='Verbose', action="store_true", help="increase output messages")
|
||||||
parser.add_argument("-q", "--quiet", dest='Quiet', action="store_true", help="reduce output messages")
|
parser.add_argument("-q", "--quiet", dest='Quiet', action="store_true", help="reduce output messages")
|
||||||
parser.add_argument("--debug", dest='Debug', type=int, metavar='[0-9]', choices=range(0,10), default=0, help="set debug level")
|
parser.add_argument("--debug", dest='Debug', type=int, metavar='[0-9]', choices=range(0,10), default=0, help="set debug level")
|
||||||
parser.add_argument(metavar="input_file", dest='InputFile', type=argparse.FileType('rb'), help="specify the input filename")
|
parser.add_argument(metavar="input_file", dest='InputFile', type=argparse.FileType('rb'), help="specify the input filename")
|
||||||
|
|
||||||
#
|
#
|
||||||
# Parse command line arguments
|
# Parse command line arguments
|
||||||
#
|
#
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
#
|
#
|
||||||
# Generate file path to Open SSL command
|
# Generate file path to Open SSL command
|
||||||
#
|
#
|
||||||
OpenSslCommand = 'openssl'
|
OpenSslCommand = 'openssl'
|
||||||
try:
|
try:
|
||||||
OpenSslPath = os.environ['OPENSSL_PATH']
|
OpenSslPath = os.environ['OPENSSL_PATH']
|
||||||
OpenSslCommand = os.path.join(OpenSslPath, OpenSslCommand)
|
OpenSslCommand = os.path.join(OpenSslPath, OpenSslCommand)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
#
|
#
|
||||||
# Verify that Open SSL command is available
|
# Verify that Open SSL command is available
|
||||||
#
|
#
|
||||||
try:
|
try:
|
||||||
Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
Process = subprocess.Popen('%s version' % (OpenSslCommand), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
except:
|
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)
|
sys.exit(1)
|
||||||
|
|
||||||
Version = Process.communicate()
|
Version = Process.communicate()
|
||||||
if Process.returncode <> 0:
|
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)
|
sys.exit(Process.returncode)
|
||||||
print Version[0]
|
print Version[0]
|
||||||
|
|
||||||
#
|
#
|
||||||
# Read input file into a buffer and save input filename
|
# Read input file into a buffer and save input filename
|
||||||
#
|
#
|
||||||
args.InputFileName = args.InputFile.name
|
args.InputFileName = args.InputFile.name
|
||||||
args.InputFileBuffer = args.InputFile.read()
|
args.InputFileBuffer = args.InputFile.read()
|
||||||
args.InputFile.close()
|
args.InputFile.close()
|
||||||
|
|
||||||
#
|
#
|
||||||
# Save output filename and check if path exists
|
# Save output filename and check if path exists
|
||||||
#
|
#
|
||||||
OutputDir = os.path.dirname(args.OutputFile)
|
OutputDir = os.path.dirname(args.OutputFile)
|
||||||
if not os.path.exists(OutputDir):
|
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)
|
sys.exit(1)
|
||||||
args.OutputFileName = args.OutputFile
|
args.OutputFileName = args.OutputFile
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if args.MonotonicCountStr.upper().startswith('0X'):
|
if args.MonotonicCountStr.upper().startswith('0X'):
|
||||||
args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16)
|
args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16)
|
||||||
else:
|
else:
|
||||||
args.MonotonicCountValue = (long)(args.MonotonicCountStr)
|
args.MonotonicCountValue = (long)(args.MonotonicCountStr)
|
||||||
except:
|
except:
|
||||||
args.MonotonicCountValue = (long)(0)
|
args.MonotonicCountValue = (long)(0)
|
||||||
|
|
||||||
if args.Encode:
|
if args.Encode:
|
||||||
#
|
#
|
||||||
# Save signer private cert filename and close private cert file
|
# Save signer private cert filename and close private cert file
|
||||||
#
|
#
|
||||||
try:
|
try:
|
||||||
args.SignerPrivateCertFileName = args.SignerPrivateCertFile.name
|
args.SignerPrivateCertFileName = args.SignerPrivateCertFile.name
|
||||||
args.SignerPrivateCertFile.close()
|
args.SignerPrivateCertFile.close()
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
#
|
#
|
||||||
# Get path to currently executing script or executable
|
# Get path to currently executing script or executable
|
||||||
#
|
#
|
||||||
if hasattr(sys, 'frozen'):
|
if hasattr(sys, 'frozen'):
|
||||||
Pkcs7ToolPath = sys.executable
|
Pkcs7ToolPath = sys.executable
|
||||||
else:
|
else:
|
||||||
Pkcs7ToolPath = sys.argv[0]
|
Pkcs7ToolPath = sys.argv[0]
|
||||||
if Pkcs7ToolPath.startswith('"'):
|
if Pkcs7ToolPath.startswith('"'):
|
||||||
Pkcs7ToolPath = Pkcs7ToolPath[1:]
|
Pkcs7ToolPath = Pkcs7ToolPath[1:]
|
||||||
if Pkcs7ToolPath.endswith('"'):
|
if Pkcs7ToolPath.endswith('"'):
|
||||||
Pkcs7ToolPath = RsaToolPath[:-1]
|
Pkcs7ToolPath = RsaToolPath[:-1]
|
||||||
args.SignerPrivateCertFileName = os.path.join(os.path.dirname(os.path.realpath(Pkcs7ToolPath)), TEST_SIGNER_PRIVATE_CERT_FILENAME)
|
args.SignerPrivateCertFileName = os.path.join(os.path.dirname(os.path.realpath(Pkcs7ToolPath)), TEST_SIGNER_PRIVATE_CERT_FILENAME)
|
||||||
args.SignerPrivateCertFile = open(args.SignerPrivateCertFileName, 'rb')
|
args.SignerPrivateCertFile = open(args.SignerPrivateCertFileName, 'rb')
|
||||||
args.SignerPrivateCertFile.close()
|
args.SignerPrivateCertFile.close()
|
||||||
except:
|
except:
|
||||||
print 'ERROR: test signer private cert file %s missing' % (args.SignerPrivateCertFileName)
|
print 'ERROR: test signer private cert file %s missing' % (args.SignerPrivateCertFileName)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Save other public cert filename and close public cert file
|
# Save other public cert filename and close public cert file
|
||||||
#
|
#
|
||||||
try:
|
try:
|
||||||
args.OtherPublicCertFileName = args.OtherPublicCertFile.name
|
args.OtherPublicCertFileName = args.OtherPublicCertFile.name
|
||||||
args.OtherPublicCertFile.close()
|
args.OtherPublicCertFile.close()
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
#
|
#
|
||||||
# Get path to currently executing script or executable
|
# Get path to currently executing script or executable
|
||||||
#
|
#
|
||||||
if hasattr(sys, 'frozen'):
|
if hasattr(sys, 'frozen'):
|
||||||
Pkcs7ToolPath = sys.executable
|
Pkcs7ToolPath = sys.executable
|
||||||
else:
|
else:
|
||||||
Pkcs7ToolPath = sys.argv[0]
|
Pkcs7ToolPath = sys.argv[0]
|
||||||
if Pkcs7ToolPath.startswith('"'):
|
if Pkcs7ToolPath.startswith('"'):
|
||||||
Pkcs7ToolPath = Pkcs7ToolPath[1:]
|
Pkcs7ToolPath = Pkcs7ToolPath[1:]
|
||||||
if Pkcs7ToolPath.endswith('"'):
|
if Pkcs7ToolPath.endswith('"'):
|
||||||
Pkcs7ToolPath = RsaToolPath[:-1]
|
Pkcs7ToolPath = RsaToolPath[:-1]
|
||||||
args.OtherPublicCertFileName = os.path.join(os.path.dirname(os.path.realpath(Pkcs7ToolPath)), TEST_OTHER_PUBLIC_CERT_FILENAME)
|
args.OtherPublicCertFileName = os.path.join(os.path.dirname(os.path.realpath(Pkcs7ToolPath)), TEST_OTHER_PUBLIC_CERT_FILENAME)
|
||||||
args.OtherPublicCertFile = open(args.OtherPublicCertFileName, 'rb')
|
args.OtherPublicCertFile = open(args.OtherPublicCertFileName, 'rb')
|
||||||
args.OtherPublicCertFile.close()
|
args.OtherPublicCertFile.close()
|
||||||
except:
|
except:
|
||||||
print 'ERROR: test other public cert file %s missing' % (args.OtherPublicCertFileName)
|
print 'ERROR: test other public cert file %s missing' % (args.OtherPublicCertFileName)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
format = "Q%ds" % len(args.InputFileBuffer)
|
format = "Q%ds" % len(args.InputFileBuffer)
|
||||||
FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)
|
FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Sign the input file using the specified private key and capture signature from STDOUT
|
# Sign the input file using the specified private key and capture signature from STDOUT
|
||||||
#
|
#
|
||||||
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)
|
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)
|
||||||
Signature = Process.communicate(input=FullInputFileBuffer)[0]
|
Signature = Process.communicate(input=FullInputFileBuffer)[0]
|
||||||
if Process.returncode <> 0:
|
if Process.returncode <> 0:
|
||||||
sys.exit(Process.returncode)
|
sys.exit(Process.returncode)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Write output file that contains Signature, and Input data
|
# Write output file that contains Signature, and Input data
|
||||||
#
|
#
|
||||||
args.OutputFile = open(args.OutputFileName, 'wb')
|
args.OutputFile = open(args.OutputFileName, 'wb')
|
||||||
args.OutputFile.write(Signature)
|
args.OutputFile.write(Signature)
|
||||||
args.OutputFile.write(args.InputFileBuffer)
|
args.OutputFile.write(args.InputFileBuffer)
|
||||||
args.OutputFile.close()
|
args.OutputFile.close()
|
||||||
|
|
||||||
if args.Decode:
|
if args.Decode:
|
||||||
#
|
#
|
||||||
# Save trusted public cert filename and close public cert file
|
# Save trusted public cert filename and close public cert file
|
||||||
#
|
#
|
||||||
try:
|
try:
|
||||||
args.TrustedPublicCertFileName = args.TrustedPublicCertFile.name
|
args.TrustedPublicCertFileName = args.TrustedPublicCertFile.name
|
||||||
args.TrustedPublicCertFile.close()
|
args.TrustedPublicCertFile.close()
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
#
|
#
|
||||||
# Get path to currently executing script or executable
|
# Get path to currently executing script or executable
|
||||||
#
|
#
|
||||||
if hasattr(sys, 'frozen'):
|
if hasattr(sys, 'frozen'):
|
||||||
Pkcs7ToolPath = sys.executable
|
Pkcs7ToolPath = sys.executable
|
||||||
else:
|
else:
|
||||||
Pkcs7ToolPath = sys.argv[0]
|
Pkcs7ToolPath = sys.argv[0]
|
||||||
if Pkcs7ToolPath.startswith('"'):
|
if Pkcs7ToolPath.startswith('"'):
|
||||||
Pkcs7ToolPath = Pkcs7ToolPath[1:]
|
Pkcs7ToolPath = Pkcs7ToolPath[1:]
|
||||||
if Pkcs7ToolPath.endswith('"'):
|
if Pkcs7ToolPath.endswith('"'):
|
||||||
Pkcs7ToolPath = RsaToolPath[:-1]
|
Pkcs7ToolPath = RsaToolPath[:-1]
|
||||||
args.TrustedPublicCertFileName = os.path.join(os.path.dirname(os.path.realpath(Pkcs7ToolPath)), TEST_TRUSTED_PUBLIC_CERT_FILENAME)
|
args.TrustedPublicCertFileName = os.path.join(os.path.dirname(os.path.realpath(Pkcs7ToolPath)), TEST_TRUSTED_PUBLIC_CERT_FILENAME)
|
||||||
args.TrustedPublicCertFile = open(args.TrustedPublicCertFileName, 'rb')
|
args.TrustedPublicCertFile = open(args.TrustedPublicCertFileName, 'rb')
|
||||||
args.TrustedPublicCertFile.close()
|
args.TrustedPublicCertFile.close()
|
||||||
except:
|
except:
|
||||||
print 'ERROR: test trusted public cert file %s missing' % (args.TrustedPublicCertFileName)
|
print 'ERROR: test trusted public cert file %s missing' % (args.TrustedPublicCertFileName)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if not args.SignatureSizeStr:
|
if not args.SignatureSizeStr:
|
||||||
print "ERROR: please use the option --signature-size to specify the size of the signature data!"
|
print "ERROR: please use the option --signature-size to specify the size of the signature data!"
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
else:
|
else:
|
||||||
if args.SignatureSizeStr.upper().startswith('0X'):
|
if args.SignatureSizeStr.upper().startswith('0X'):
|
||||||
SignatureSize = (long)(args.SignatureSizeStr, 16)
|
SignatureSize = (long)(args.SignatureSizeStr, 16)
|
||||||
else:
|
else:
|
||||||
SignatureSize = (long)(args.SignatureSizeStr)
|
SignatureSize = (long)(args.SignatureSizeStr)
|
||||||
if SignatureSize < 0:
|
if SignatureSize < 0:
|
||||||
print "ERROR: The value of option --signature-size can't be set to negative value!"
|
print "ERROR: The value of option --signature-size can't be set to negative value!"
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
elif SignatureSize > len(args.InputFileBuffer):
|
elif SignatureSize > len(args.InputFileBuffer):
|
||||||
print "ERROR: The value of option --signature-size is exceed the size of the input file !"
|
print "ERROR: The value of option --signature-size is exceed the size of the input file !"
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
args.SignatureBuffer = args.InputFileBuffer[0:SignatureSize]
|
args.SignatureBuffer = args.InputFileBuffer[0:SignatureSize]
|
||||||
args.InputFileBuffer = args.InputFileBuffer[SignatureSize:]
|
args.InputFileBuffer = args.InputFileBuffer[SignatureSize:]
|
||||||
|
|
||||||
format = "Q%ds" % len(args.InputFileBuffer)
|
format = "Q%ds" % len(args.InputFileBuffer)
|
||||||
FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)
|
FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Save output file contents from input file
|
# Save output file contents from input file
|
||||||
#
|
#
|
||||||
open(args.OutputFileName, 'wb').write(FullInputFileBuffer)
|
open(args.OutputFileName, 'wb').write(FullInputFileBuffer)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Verify signature
|
# Verify signature
|
||||||
#
|
#
|
||||||
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)
|
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)
|
||||||
Process.communicate(input=args.SignatureBuffer)[0]
|
Process.communicate(input=args.SignatureBuffer)[0]
|
||||||
if Process.returncode <> 0:
|
if Process.returncode <> 0:
|
||||||
print 'ERROR: Verification failed'
|
print 'ERROR: Verification failed'
|
||||||
os.remove (args.OutputFileName)
|
os.remove (args.OutputFileName)
|
||||||
sys.exit(Process.returncode)
|
sys.exit(Process.returncode)
|
||||||
|
|
||||||
open(args.OutputFileName, 'wb').write(args.InputFileBuffer)
|
open(args.OutputFileName, 'wb').write(args.InputFileBuffer)
|
||||||
|
|||||||
Reference in New Issue
Block a user