rsa: add support for 4096 and 8192 bit keys

Allow to use larger RSA keys by setting CONFIG_RSA_KEY_SIZE to 4096 or
8192 rather than using the default 2048-bit size.

It's mainly for benchmarking purpose right now as we don't have the RAM
to store the 3x key size buffer and the flash space for the public key
structure.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BRANCH=samus
BUG=none
TEST=build Zinger with CONFIG_RSA_KEY_SIZE equals to 4096 and run it.

Change-Id: I9839121bf158d0a30dde1e48d875f345191bfec2
Reviewed-on: https://chromium-review.googlesource.com/228925
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>

2 files changed, 23 insertions, 8 deletions

diff --git a/util/ec_sign_rsa.py b/util/ec_sign_rsa.py
index 661ed37653..9c23f9edbe 100755
--- a/util/ec_sign_rsa.py
+++ b/util/ec_sign_rsa.py
@@ -18,26 +18,36 @@ import sys
 from subprocess import Popen, PIPE
 from pem_extract_pubkey import extract_pubkey
 
-# Size of a 2048-bit RSA signature
-RSANUMBYTES = 256
 # OpenSSL command to sign with SHA256andRSA
 RSA_CMD = ["openssl", "dgst", "-sha256", "-sign"]
 
-# Length reserved at the end of the RO partition for the public key
-PUBKEY_RESERVED_SPACE = 528
+# supported RSA key sizes
+RSA_KEY_SIZES=[2048, 4096, 8192]
+
+def align16(v):
+  return (v + 15) / 16 * 16
 
 def main():
   # Parse command line arguments
   if len(sys.argv) < 3:
-    sys.stderr.write("Usage: %s [--rw] <pem> <ecfile>\n" % sys.argv[0])
+    sys.stderr.write("Usage: %s [--rw] [--4096|--8192] <pem> <ecfile>\n" % sys.argv[0])
     sys.exit(-1)
   if "--rw" in sys.argv:
     sys.argv.remove("--rw")
     has_ro = False
   else:
     has_ro = True
+  # Default to a 2048-bit RSA signature
+  RSANUMBYTES = 2048 / 8
+  for sz in RSA_KEY_SIZES:
+    param = "--%d" % (sz)
+    if param in sys.argv:
+      sys.argv.remove(param)
+      RSANUMBYTES = sz / 8
   pemfile = sys.argv[1]
   ecfile = sys.argv[2]
+  # Length reserved at the end of the RO partition for the public key
+  PUBKEY_RESERVED_SPACE = align16(2 * RSANUMBYTES + 4)
 
   # Get EC firmware content
   try:
diff --git a/util/pem_extract_pubkey.py b/util/pem_extract_pubkey.py
index 739e1bea57..d368da8ee7 100755
--- a/util/pem_extract_pubkey.py
+++ b/util/pem_extract_pubkey.py
@@ -48,6 +48,9 @@ RSAPrivateKey ::= SEQUENCE {
 PEM_HEADER='-----BEGIN RSA PRIVATE KEY-----'
 PEM_FOOTER='-----END RSA PRIVATE KEY-----'
 
+# supported RSA key sizes
+RSA_KEY_SIZES=[2048, 4096, 8192]
+
 class PEMError(Exception):
   """Exception class for pem_extract_pubkey utility."""
 
@@ -130,8 +133,9 @@ def pem_get_mod(filename):
   if mod["tag"] != DER_INTEGER:
     raise PEMError('modulus field should be an integer')
   # 2048 bits + mandatory ASN.1 sign (0) => 257 Bytes
-  if mod["length"] != 257 or mod["data"][0] != '\x00':
-    raise PEMError('Invalid key length (expecting 2048 bits)')
+  modSize = (mod["length"] - 1) * 8
+  if modSize not in RSA_KEY_SIZES or mod["data"][0] != '\x00':
+    raise PEMError('Invalid key length : %d bits' % (modSize))
 
   # 3rd field is Public Exponent
   exp = seq.get_tag()
@@ -171,6 +175,7 @@ def compute_mod_parameters(modulus):
   '''
   # create an array of uint32_t to store the modulus but skip the sign byte
   w = array.array("I",modulus[1:])
+  wordCount = (len(modulus) - 1) / 4
   # all integers in DER encoded .pem file are big endian.
   w.reverse()
   w.byteswap()
@@ -183,7 +188,7 @@ def compute_mod_parameters(modulus):
   n0inv = B - modinv(w[0], B)
   # R = 2^(modulo size); RR = (R * R) % N
   RR = pow(2, 4096, N)
-  rr_words = to_words(RR, 64)
+  rr_words = to_words(RR, wordCount)
 
   return {'mod':w, 'rr':rr_words, 'n0inv':n0inv}