diff options
| author | Shawn Willden <swillden@google.com> | 2016-09-19 19:27:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-19 19:27:33 +0000 |
| commit | 89cd6d2b2e36a52cd23d35263e67c5581e51b1a2 (patch) | |
| tree | 25f8a9a222bed3821f83e1eaaa88ab2ee83363dc | |
| parent | b1e930a5c925decd5a5e3c3d8ea3b112b01ee519 (diff) | |
| parent | 14d960a627aff22c6fbc623770d3101f58ca359d (diff) | |
| download | keymaster-89cd6d2b2e36a52cd23d35263e67c5581e51b1a2.tar.gz | |
Don't reject OS version "upgrades" to zero.
am: 14d960a627
Change-Id: I1847ba959bc453e65bdd3a97553212db936c78d9
| -rw-r--r-- | soft_keymaster_context.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/soft_keymaster_context.cpp b/soft_keymaster_context.cpp index 087439a..10ce893 100644 --- a/soft_keymaster_context.cpp +++ b/soft_keymaster_context.cpp @@ -493,6 +493,21 @@ keymaster_error_t SoftKeymasterContext::UpgradeKeyBlob(const KeymasterKeyBlob& k // Handle cases 1 & 2. bool set_changed = false; + + if (os_version_ == 0) { + // We need to allow "upgrading" OS version to zero, to support upgrading from proper + // numbered releases to unnumbered development and preview releases. + + int key_os_version_pos = sw_enforced.find(TAG_OS_VERSION); + if (key_os_version_pos != -1) { + uint32_t key_os_version = sw_enforced[key_os_version_pos].integer; + if (key_os_version != 0) { + sw_enforced[key_os_version_pos].integer = os_version_; + set_changed = true; + } + } + } + if (!UpgradeIntegerTag(TAG_OS_VERSION, os_version_, &sw_enforced, &set_changed) || !UpgradeIntegerTag(TAG_OS_PATCHLEVEL, os_patchlevel_, &sw_enforced, &set_changed)) // One of the version fields would have been a downgrade. Not allowed. |