Index: firmware/lib/rollback_index.c |
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c |
index cb86e89e8d51cf7952a3adacc24acd03e40241d7..728087a781e90a2ae01c6ea5ade0bd9ca2422209 100644 |
--- a/firmware/lib/rollback_index.c |
+++ b/firmware/lib/rollback_index.c |
@@ -121,15 +121,15 @@ static uint32_t GetTPMRollbackIndices(int type) { |
RETURN_ON_FAILURE(TlclRead(FIRMWARE_VERSIONS_NV_INDEX, |
(uint8_t*) &firmware_versions, |
sizeof(firmware_versions))); |
- g_firmware_key_version = firmware_versions >> 16; |
- g_firmware_version = firmware_versions && 0xffff; |
+ g_firmware_key_version = (uint16_t) (firmware_versions >> 16); |
+ g_firmware_version = (uint16_t) (firmware_versions & 0xffff); |
break; |
case KERNEL_VERSIONS: |
RETURN_ON_FAILURE(TlclRead(KERNEL_VERSIONS_NV_INDEX, |
(uint8_t*) &kernel_versions, |
sizeof(kernel_versions))); |
- g_kernel_key_version = kernel_versions >> 16; |
- g_kernel_version = kernel_versions && 0xffff; |
+ g_kernel_key_version = (uint16_t) (kernel_versions >> 16); |
+ g_kernel_version = (uint16_t) (kernel_versions & 0xffff); |
break; |
} |