esptool 5.3.dev1__tar.gz → 5.3.dev3__tar.gz

{esptool-5.3.dev1/esptool.egg-info → esptool-5.3.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esptool
-Version: 5.3.dev1
+Version: 5.3.dev3
 Summary: A serial utility for flashing, provisioning, and interacting with Espressif SoCs.
 Author: Fredrik Ahlberg (themadinventor), Angus Gratton (projectgus), Espressif Systems
 License: GPLv2+

{esptool-5.3.dev1 → esptool-5.3.dev3}/esp_rfc2217_server/__init__.py

@@ -15,6 +15,7 @@
 import logging
 import socket
 import sys
+
 import serial
 
 from esp_rfc2217_server.redirector import Redirector

{esptool-5.3.dev1 → esptool-5.3.dev3}/esp_rfc2217_server/esp_port_manager.py

@@ -4,13 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 import os
 import threading
-from esptool.reset import (
-    ClassicReset,
-    CustomReset,
-    DEFAULT_RESET_DELAY,
-    HardReset,
-    UnixTightReset,
-)
+
 import serial
 import serial.rfc2217
 from serial.rfc2217 import (
@@ -23,6 +17,13 @@ from serial.rfc2217 import (
 )
 
 from esptool.config import load_config_file
+from esptool.reset import (
+    DEFAULT_RESET_DELAY,
+    ClassicReset,
+    CustomReset,
+    HardReset,
+    UnixTightReset,
+)
 
 cfg, _ = load_config_file(verbose=True)
 cfg = cfg["esptool"]

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/__init__.py

@@ -7,20 +7,19 @@ import sys
 import rich_click as click
 
 import esptool
-from esptool.cli_util import BaudRateType, ChipType, ResetModeType, SerialPortType
-from esptool.logger import log
-
 from espefuse.cli_util import Group
 from espefuse.efuse.base_operations import BaseCommands
 from espefuse.efuse_interface import (
     DEPRECATED_COMMANDS,
-    get_esp,
-    init_commands,
-    SUPPORTED_COMMANDS,
     SUPPORTED_BURN_COMMANDS,
-    SUPPORTED_READ_COMMANDS,
     SUPPORTED_CHIPS,
+    SUPPORTED_COMMANDS,
+    SUPPORTED_READ_COMMANDS,
+    get_esp,
+    init_commands,
 )
+from esptool.cli_util import BaudRateType, ChipType, ResetModeType, SerialPortType
+from esptool.logger import log
 from esptool.util import check_deprecated_py_suffix
 
 __all__ = [

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/cli_util.py

@@ -6,17 +6,16 @@ from typing import Any
 
 import rich_click as click
 from click.parser import OptionParser, ParsingState, _unpack_args
-from esptool.cli_util import Group as EsptoolGroup
-from esptool.logger import log
 
 from espefuse.efuse_interface import (
     DEPRECATED_COMMANDS,
-    init_commands,
     SUPPORTED_BURN_COMMANDS,
-    SUPPORTED_READ_COMMANDS,
     SUPPORTED_COMMANDS,
+    SUPPORTED_READ_COMMANDS,
+    init_commands,
 )
-
+from esptool.cli_util import Group as EsptoolGroup
+from esptool.logger import log
 
 click.rich_click.USE_CLICK_SHORT_HELP = True
 click.rich_click.COMMAND_GROUPS = {

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/base_fields.py

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from abc import ABC, abstractmethod
 import binascii
 import sys
 import typing as t
+from abc import ABC, abstractmethod
 
-from bitstring import BitArray, BitStream, Bits, CreationError
+from bitstring import BitArray, Bits, BitStream, CreationError
 
+import esptool
 from espefuse.efuse.mem_definition_base import (
     BlockDefinition,
     EfuseBlocksBase,
     EfuseRegistersBase,
     Field,
 )
-import esptool
 from esptool.logger import log
 
 from . import util
@@ -582,11 +582,7 @@ class EspEfusesBase(ABC):
         log.print("Re-connecting...")
         baudrate = esp._port.baudrate
         port = esp._port.port
-        connect_mode = (
-            "usb-reset"
-            if esp._get_pid() == esp.USB_JTAG_SERIAL_PID
-            else "default-reset"
-        )
+        connect_mode = "usb-reset" if esp.uses_usb_jtag_serial() else "default-reset"
         log.print(f"Port: {port}, Baudrate: {baudrate}, Connect mode: {connect_mode}")
         esp._port.close()
         return esptool.detect_chip(port, baudrate, connect_mode)

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/base_operations.py

@@ -4,24 +4,22 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from abc import ABC, abstractmethod
 import io
-import os
 import json
+import os
 import sys
-from typing import Any, BinaryIO, TextIO, cast
+from abc import ABC, abstractmethod
 from collections.abc import Callable
+from typing import Any, BinaryIO, TextIO, cast
 
-import espsecure
 import rich_click as click
-
 from bitstring import BitStream
 
+import espsecure
 import esptool
 from esptool.logger import log
 
-from . import base_fields
-from . import util
+from . import base_fields, util
 from .emulate_efuse_controller_base import EmulateEfuseControllerBase
 
 
@@ -760,6 +758,9 @@ class BaseCommands(ABC):
                     json_efuse[e.name] = {
                         "name": e.name,
                         "value": base_value if readable else value,
+                        "raw_value": util.json_raw_value_hex(
+                            e.efuse_type, e.get_bitstring()
+                        ),
                         "readable": readable,
                         "writeable": writeable,
                         "description": e.description,

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/emulate_efuse_controller_base.py

@@ -4,11 +4,12 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from abc import ABC, abstractmethod
 import re
+from abc import ABC, abstractmethod
 from typing import Any
 
 from bitstring import BitStream
+
 from espefuse.efuse.mem_definition_base import (
     BlockDefinition,
     EfuseBlocksBase,
@@ -101,9 +102,6 @@ class EmulateEfuseControllerBase(ABC):
         blk = self.Blocks.get(self.Blocks.BLOCKS[block])
         self.write_reg(blk.wr_addr + (4 * n), value)
 
-    def _get_pid(self) -> int:
-        return -1
-
     """ << esptool method end """
 
     def handle_writing_event(self, addr: int, value: int) -> None:

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32/fields.py

@@ -10,10 +10,9 @@ import time
 import esptool
 from esptool import log
 
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
-from .. import base_fields
-from .. import util
+from .. import base_fields, util
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c2/emulate_efuse_controller.py

@@ -4,16 +4,14 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from bitstring import BitStream
-
 import reedsolo
+from bitstring import BitStream
 
 from espefuse.efuse.mem_definition_base import BlockDefinition
+from esptool import FatalError
 
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from ..emulate_efuse_controller_base import EmulateEfuseControllerBase
-
-from esptool import FatalError
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EmulateEfuseController(EmulateEfuseControllerBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c2/fields.py

@@ -8,16 +8,15 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
 
 import esptool
 from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c2/operations.py

@@ -6,14 +6,13 @@
 
 from io import IOBase
 from typing import BinaryIO
+
 import rich_click as click
 
 import espsecure
 import esptool
 from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32C2Commands(BaseCommands):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c3/fields.py

@@ -8,16 +8,15 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
 
 import esptool
 from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c5/fields.py

@@ -8,16 +8,15 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
 
 import esptool
 from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c5/operations.py

@@ -6,14 +6,13 @@
 
 from io import IOBase
 from typing import BinaryIO
+
 import rich_click as click
 
 import espsecure
 import esptool
 from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32C5Commands(BaseCommands):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c6/operations.py

@@ -6,14 +6,13 @@
 
 from io import IOBase
 from typing import BinaryIO
-from esptool.logger import log
+
 import rich_click as click
 
 import espsecure
 import esptool
+from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32C6Commands(BaseCommands):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c61/fields.py

@@ -8,16 +8,15 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
-from esptool.logger import log
 
 import esptool
+from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32c61/operations.py

@@ -6,14 +6,13 @@
 
 import io
 from typing import BinaryIO
-from esptool.logger import log
+
 import rich_click as click
 
 import espsecure
 import esptool
+from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32C61Commands(BaseCommands):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32e22/fields.py

@@ -8,15 +8,14 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
 
 import esptool
 from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32h2/fields.py

@@ -8,16 +8,15 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
-from esptool.logger import log
 
 import esptool
+from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32h2/operations.py

@@ -6,14 +6,13 @@
 
 from io import IOBase
 from typing import BinaryIO
-from esptool.logger import log
+
 import rich_click as click
 
 import espsecure
 import esptool
+from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32H2Commands(BaseCommands):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32h21/fields.py

@@ -8,16 +8,15 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
-from esptool.logger import log
 
 import esptool
+from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32h21/operations.py

@@ -6,14 +6,13 @@
 
 from io import IOBase
 from typing import BinaryIO
-from esptool.logger import log
+
 import rich_click as click
 
 import espsecure
 import esptool
+from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32H21Commands(BaseCommands):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32h4/fields.py

@@ -7,16 +7,15 @@
 import struct
 import time
 
+import reedsolo
 from bitstring import BitArray
-from esptool.logger import log
 
 import esptool
+from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):
@@ -212,8 +211,6 @@ class EspEfuses(base_fields.EspEfusesBase):
                 f"The eFuse supports only xtal=32M (xtal was {apb_freq}"
             )
 
-        # TODO: [ESP32H4] IDF-12268
-
     def get_coding_scheme_warnings(self, silent=False):
         """Check if the coding scheme has detected any errors."""
         old_addr_reg = 0
@@ -281,9 +278,7 @@ class EfuseMacField(base_fields.EfuseMacFieldBase, EfuseField):
 
 
 class EfuseWafer(base_fields.EfuseWaferBase, EfuseField):
-    def get(self, from_read=True):
-        # TODO: [ESP32H4] IDF-12268
-        return 0
+    pass
 
 
 class EfuseKeyPurposeField(base_fields.EfuseKeyPurposeFieldBase, EfuseField):
@@ -293,6 +288,8 @@ class EfuseKeyPurposeField(base_fields.EfuseKeyPurposeFieldBase, EfuseField):
         ("USER",                         0,  None,       None,      "no_need_rd_protect"),   # User purposes (software-only use)
         ("ECDSA_KEY_P256",               1,  None,       "Reverse", "need_rd_protect"),      # ECDSA key P256 (NIST P-256)
         ("ECDSA_KEY",                    1,  None,       "Reverse", "need_rd_protect"),      # ECDSA key (alias for P256)
+        ("XTS_AES_256_KEY_1",            2,  None,       "Reverse", "need_rd_protect"),      # Flash encryption key (XTS-AES-256 low/first half)
+        ("XTS_AES_256_KEY_2",            3,  None,       "Reverse", "need_rd_protect"),      # Flash encryption key (XTS-AES-256 high/second half)
         ("XTS_AES_128_KEY",              4,  None,       "Reverse", "need_rd_protect"),      # XTS_AES_128_KEY (flash/PSRAM encryption)
         ("HMAC_DOWN_ALL",                5,  None,       None,      "need_rd_protect"),      # HMAC Downstream mode
         ("HMAC_DOWN_JTAG",               6,  None,       None,      "need_rd_protect"),      # JTAG soft enable key (uses HMAC Downstream mode)
@@ -302,9 +299,14 @@ class EfuseKeyPurposeField(base_fields.EfuseKeyPurposeFieldBase, EfuseField):
         ("SECURE_BOOT_DIGEST1",          10, "DIGEST",   None,      "no_need_rd_protect"),   # SECURE_BOOT_DIGEST1 (Secure Boot key digest)
         ("SECURE_BOOT_DIGEST2",          11, "DIGEST",   None,      "no_need_rd_protect"),   # SECURE_BOOT_DIGEST2 (Secure Boot key digest)
         ("KM_INIT_KEY",                  12, None,       None,      "need_rd_protect"),      # init key that is used for the generation of AES/ECDSA key
+        ("XTS_AES_256_PSRAM_KEY_1",      13, None,       "Reverse", "need_rd_protect"),      # PSRAM encryption key (XTS-AES-256 low/first half)
+        ("XTS_AES_256_PSRAM_KEY_2",      14, None,       "Reverse", "need_rd_protect"),      # PSRAM encryption key (XTS-AES-256 high/second half)
+        ("XTS_AES_128_PSRAM_KEY",        15, None,       "Reverse", "need_rd_protect"),      # PSRAM encryption key (XTS-AES-128)
         ("ECDSA_KEY_P192",               16, None,       "Reverse", "need_rd_protect"),      # ECDSA key P192 (NIST P-192)
         ("ECDSA_KEY_P384_L",             17, None,       "Reverse", "need_rd_protect"),      # ECDSA key P384 low half
         ("ECDSA_KEY_P384_H",             18, None,       "Reverse", "need_rd_protect"),      # ECDSA key P384 high half
+        ("XTS_AES_256_KEY",              -1, "VIRTUAL",  None,      "no_need_rd_protect"),   # Virtual purpose splits to XTS_AES_256_KEY_1 and XTS_AES_256_KEY_2
+        ("XTS_AES_256_PSRAM_KEY",        -2, "VIRTUAL",  None,      "no_need_rd_protect"),   # Virtual purpose splits to XTS_AES_256_PSRAM_KEY_1 and XTS_AES_256_PSRAM_KEY_2
         ("ECDSA_KEY_P384",               -3, "VIRTUAL",  None,      "need_rd_protect"),      # Virtual: one key file -> ECDSA_KEY_P384_L + ECDSA_KEY_P384_H
     ]
     # fmt: on

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32h4/operations.py

@@ -6,14 +6,13 @@
 
 from io import IOBase
 from typing import BinaryIO
-from esptool.logger import log
+
 import rich_click as click
 
 import espsecure
 import esptool
+from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32H4Commands(BaseCommands):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32p4/fields.py

@@ -8,16 +8,15 @@ import struct
 import sys
 import time
 
+import reedsolo
 from bitstring import BitArray
-from esptool.logger import log
 
 import esptool
+from esptool.logger import log
 
-import reedsolo
-
-from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 from .. import base_fields
 from ..mem_definition_base import Field
+from .mem_definition import EfuseDefineBlocks, EfuseDefineFields, EfuseDefineRegisters
 
 
 class EfuseBlock(base_fields.EfuseBlockBase):

{esptool-5.3.dev1 → esptool-5.3.dev3}/espefuse/efuse/esp32p4/operations.py

@@ -6,14 +6,13 @@
 
 import io
 from typing import BinaryIO
-from esptool.logger import log
+
 import rich_click as click
 
 import espsecure
 import esptool
+from esptool.logger import log
 
-from . import fields
-from .mem_definition import EfuseDefineBlocks
 from .. import util
 from ..base_operations import (
     BaseCommands,
@@ -23,6 +22,8 @@ from ..base_operations import (
     add_show_sensitive_info_option,
     protect_options,
 )
+from . import fields
+from .mem_definition import EfuseDefineBlocks
 
 
 class ESP32P4Commands(BaseCommands):