BaseTools: Rsa2048Sha256Sign add new option to support Monotonic count

[mirror_edk2.git] / BaseTools / Source / Python / Rsa2048Sha256Sign / Rsa2048Sha256Sign.py

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
index b3254d82bf353ff63de9e1e1446d3c9ca50e5fc3..34106680eef07b8b637904a2cf0c01a41e4306eb 100644 (file)
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
@@ -1,10 +1,10 @@
 ## @file\r
-# This tool encodes and decodes GUIDed FFS sections for a GUID type of\r
+# This tool encodes and decodes GUIDed FFS sections or FMP capsule for a GUID type of\r
 # EFI_CERT_TYPE_RSA2048_SHA256_GUID defined in the UEFI 2.4 Specification as\r
 #   {0xa7717414, 0xc616, 0x4977, {0x94, 0x20, 0x84, 0x47, 0x12, 0xa7, 0x35, 0xbf}}\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 - 2016, 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
@@ -32,7 +32,7 @@ from Common.BuildVersion import gBUILD_VERSION
 #\r
 __prog__      = 'Rsa2048Sha256Sign'\r
 __version__   = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)\r
-__copyright__ = 'Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.'\r
+__copyright__ = 'Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.'\r
 __usage__     = '%s -e|-d [options] <input_file>' % (__prog__)\r
 \r
 #\r
@@ -66,6 +66,7 @@ if __name__ == '__main__':
   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
   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
   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
@@ -155,13 +156,26 @@ if __name__ == '__main__':
     PublicKeyHexString=PublicKeyHexString[2:]\r
   if Process.returncode <> 0:\r
     sys.exit(Process.returncode)\r
-  \r
+\r
+  if args.MonotonicCountStr:\r
+    try:\r
+      if args.MonotonicCountStr.upper().startswith('0X'):\r
+        args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16)\r
+      else:\r
+        args.MonotonicCountValue = (long)(args.MonotonicCountStr)\r
+    except:\r
+        pass\r
+\r
   if args.Encode:\r
+    FullInputFileBuffer = args.InputFileBuffer\r
+    if args.MonotonicCountStr:\r
+      format = "Q%ds" % len(args.InputFileBuffer)\r
+      FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)\r
     # \r
     # Sign the input file using the specified private key and capture signature from STDOUT\r
     #\r
     Process = subprocess.Popen('%s sha256 -sign "%s"' % (OpenSslCommand, args.PrivateKeyFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
-    Signature = Process.communicate(input=args.InputFileBuffer)[0]\r
+    Signature = Process.communicate(input=FullInputFileBuffer)[0]\r
     if Process.returncode <> 0:\r
       sys.exit(Process.returncode)\r
       \r
@@ -196,6 +210,11 @@ if __name__ == '__main__':
       print 'ERROR: Public key in input file does not match public key from private key file'\r
       sys.exit(1)\r
 \r
+    FullInputFileBuffer = args.InputFileBuffer\r
+    if args.MonotonicCountStr:\r
+      format = "Q%ds" % len(args.InputFileBuffer)\r
+      FullInputFileBuffer = struct.pack(format,args.MonotonicCountValue, args.InputFileBuffer)\r
+\r
     #\r
     # Write Signature to output file\r
     #\r
@@ -205,7 +224,7 @@ if __name__ == '__main__':
     # Verify signature\r
     #    \r
     Process = subprocess.Popen('%s sha256 -prverify "%s" -signature %s' % (OpenSslCommand, args.PrivateKeyFileName, args.OutputFileName), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
-    Process.communicate(args.InputFileBuffer)\r
+    Process.communicate(input=FullInputFileBuffer)\r
     if Process.returncode <> 0:\r
       print 'ERROR: Verification failed'\r
       os.remove (args.OutputFileName)\r