faft-cr50: update rw key id sysinfo output for 4.24
BUG=none
TEST=run firmware_Cr50TpmManufactured on octopus
Change-Id: I34239c06ca5687057751d71b2c0bc189b2c43dbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2008449
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Dana Goyette <dgoyette@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
diff --git a/server/cros/servo/chrome_cr50.py b/server/cros/servo/chrome_cr50.py
index f31b1a2..85ab1e0 100644
--- a/server/cros/servo/chrome_cr50.py
+++ b/server/cros/servo/chrome_cr50.py
@@ -32,6 +32,8 @@
provides many interfaces to set and get its behavior via console commands.
This class is to abstract these interfaces.
"""
+ PROD_RW_KEYIDS = ['0x87b73b67', '0xde88588d']
+ PROD_RO_KEYIDS = ['0xaa66150f']
OPEN = 'open'
UNLOCK = 'unlock'
LOCK = 'lock'
@@ -581,9 +583,9 @@
def using_prod_rw_keys(self):
"""Returns True if the RW keyid is prod"""
rv = self.send_command_retry_get_output('sysinfo',
- ['RW keyid:.*\(([a-z]+)\)'], safe=True)
- logging.info(rv)
- return rv[0][1] == 'prod'
+ ['RW keyid:\s+(0x[0-9a-f]{8})'], safe=True)[0][1]
+ logging.info('RW Keyid: 0x%s', rv)
+ return rv in self.PROD_RW_KEYIDS
def get_active_board_id_str(self):