Skip to content

Commit dce0925

Browse files
committed
fix(esp_security/esp_key_mgr): Incorrect overlapping comparisons
1 parent 54fe337 commit dce0925

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

components/esp_security/src/esp_key_mgr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ static esp_err_t key_mgr_deploy_key_aes_mode(aes_deploy_config_t *config)
319319
key_mgr_hal_read_public_info(key_recovery_info, KEY_MGR_KEY_RECOVERY_INFO_SIZE);
320320
ESP_LOG_BUFFER_HEX_LEVEL("KEY_RECOVERY_INFO", key_recovery_info, KEY_MGR_KEY_RECOVERY_INFO_SIZE, ESP_LOG_DEBUG);
321321

322-
if (config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_1 || config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_1) {
322+
if (config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_1 && config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_1) {
323323
if (!key_mgr_hal_is_key_deployment_valid(config->key_config->key_type)) {
324324
ESP_LOGE(TAG, "Key deployment is not valid");
325325
heap_caps_free(key_recovery_info);
@@ -649,7 +649,7 @@ static esp_err_t key_mgr_deploy_key_ecdh0_mode(ecdh0_deploy_config_t *config)
649649

650650
ESP_LOGD(TAG, "HUK deployed is valid");
651651

652-
if (config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_1 || config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_1) {
652+
if (config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_1 && config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_1) {
653653
if (!key_mgr_hal_is_key_deployment_valid(config->key_config->key_type)) {
654654
ESP_LOGE(TAG, "Key deployment is not valid");
655655
heap_caps_free(key_recovery_info);
@@ -814,7 +814,7 @@ static esp_err_t key_mgr_deploy_key_random_mode(random_deploy_config_t *config)
814814
key_mgr_hal_read_public_info(key_recovery_info, KEY_MGR_KEY_RECOVERY_INFO_SIZE);
815815
ESP_LOG_BUFFER_HEX_LEVEL("KEY_MGR KEY INFO", key_recovery_info, KEY_MGR_KEY_RECOVERY_INFO_SIZE, ESP_LOG_DEBUG);
816816

817-
if (config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_1 || config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_1) {
817+
if (config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_1 && config->key_purpose != ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_1) {
818818
if (!key_mgr_hal_is_key_deployment_valid(config->key_config->key_type)) {
819819
ESP_LOGE(TAG, "Key deployment is not valid");
820820
heap_caps_free(key_recovery_info);

0 commit comments

Comments
 (0)