nitrokey 0.2.2__tar.gz → 0.2.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. {nitrokey-0.2.2 → nitrokey-0.2.4}/PKG-INFO +1 -2
  2. {nitrokey-0.2.2 → nitrokey-0.2.4}/pyproject.toml +3 -4
  3. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/nk3/_device.py +21 -1
  4. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/nk3/updates.py +6 -10
  5. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/nkpk.py +16 -1
  6. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52.py +17 -10
  7. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_device.py +3 -10
  8. {nitrokey-0.2.2 → nitrokey-0.2.4}/LICENSES/Apache-2.0.txt +0 -0
  9. {nitrokey-0.2.2 → nitrokey-0.2.4}/LICENSES/MIT.txt +0 -0
  10. {nitrokey-0.2.2 → nitrokey-0.2.4}/README.md +0 -0
  11. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/__init__.py +0 -0
  12. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/_helpers.py +0 -0
  13. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/nk3/__init__.py +0 -0
  14. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/nk3/_bootloader.py +0 -0
  15. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/nk3/secrets_app.py +0 -0
  16. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/py.typed +0 -0
  17. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/__init__.py +0 -0
  18. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_base.py +0 -0
  19. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/__init__.py +0 -0
  20. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55.py +0 -0
  21. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/README.md +0 -0
  22. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/__init__.py +0 -0
  23. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/crypto/__init__.py +0 -0
  24. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/crypto/certificate.py +0 -0
  25. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/crypto/hash.py +0 -0
  26. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/crypto/hmac.py +0 -0
  27. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/crypto/keys.py +0 -0
  28. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/crypto/symmetric.py +0 -0
  29. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/crypto/types.py +0 -0
  30. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/exceptions.py +0 -0
  31. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/__init__.py +0 -0
  32. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/commands.py +0 -0
  33. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/error_codes.py +0 -0
  34. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/exceptions.py +0 -0
  35. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/interfaces/__init__.py +0 -0
  36. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/interfaces/usb.py +0 -0
  37. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/mcuboot.py +0 -0
  38. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/memories.py +0 -0
  39. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/properties.py +0 -0
  40. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/protocol/__init__.py +0 -0
  41. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/protocol/base.py +0 -0
  42. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/mboot/protocol/bulk_protocol.py +0 -0
  43. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/sbfile/misc.py +0 -0
  44. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/sbfile/sb2/__init__.py +0 -0
  45. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/sbfile/sb2/commands.py +0 -0
  46. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/sbfile/sb2/headers.py +0 -0
  47. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/sbfile/sb2/images.py +0 -0
  48. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/sbfile/sb2/sections.py +0 -0
  49. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/__init__.py +0 -0
  50. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/abstract.py +0 -0
  51. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/crypto/__init__.py +0 -0
  52. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/crypto/cert_blocks.py +0 -0
  53. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/crypto/rkht.py +0 -0
  54. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/exceptions.py +0 -0
  55. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/interfaces/__init__.py +0 -0
  56. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/interfaces/commands.py +0 -0
  57. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/interfaces/device/__init__.py +0 -0
  58. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/interfaces/device/base.py +0 -0
  59. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/interfaces/device/usb_device.py +0 -0
  60. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/interfaces/protocol/__init__.py +0 -0
  61. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/interfaces/protocol/protocol_base.py +0 -0
  62. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/misc.py +0 -0
  63. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/lpc55_upload/utils/spsdk_enum.py +0 -0
  64. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/README.md +0 -0
  65. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/__init__.py +0 -0
  66. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/__init__.py +0 -0
  67. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/dfu-cc.proto +0 -0
  68. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/dfu_cc_pb2.py +0 -0
  69. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/dfu_cc_pb2.pyi +0 -0
  70. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/dfu_transport.py +0 -0
  71. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/dfu_transport_serial.py +0 -0
  72. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/init_packet_pb.py +0 -0
  73. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/dfu/manifest.py +0 -0
  74. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/exceptions.py +0 -0
  75. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/__init__.py +0 -0
  76. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/device_lister.py +0 -0
  77. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/enumerated_device.py +0 -0
  78. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/lister_backend.py +0 -0
  79. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/unix/__init__.py +0 -0
  80. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/unix/unix_lister.py +0 -0
  81. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/windows/__init__.py +0 -0
  82. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/windows/constants.py +0 -0
  83. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/windows/lister_win32.py +0 -0
  84. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_bootloader/nrf52_upload/lister/windows/structures.py +0 -0
  85. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_exceptions.py +0 -0
  86. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/_utils.py +0 -0
  87. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/admin_app.py +0 -0
  88. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/trussed/provisioner_app.py +0 -0
  89. {nitrokey-0.2.2 → nitrokey-0.2.4}/src/nitrokey/updates.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nitrokey
3
- Version: 0.2.2
3
+ Version: 0.2.4
4
4
  Summary: Nitrokey Python SDK
5
5
  Home-page: https://github.com/Nitrokey/nitrokey-sdk-py
6
6
  License: Apache-2.0 or MIT
@@ -17,7 +17,6 @@ Classifier: Programming Language :: Python :: 3.12
17
17
  Classifier: Programming Language :: Python :: 3.13
18
18
  Requires-Dist: crcmod (>=1.7,<2.0)
19
19
  Requires-Dist: cryptography (>=41)
20
- Requires-Dist: ecdsa (>=0.18,<=0.19)
21
20
  Requires-Dist: fido2 (>=1.1.2,<2.0.0)
22
21
  Requires-Dist: hidapi (>=0.14,<0.15)
23
22
  Requires-Dist: protobuf (>=5.26,<6.0)
@@ -1,10 +1,10 @@
1
1
  [build-system]
2
- requires = ["poetry-core >=1,<2"]
2
+ requires = ["poetry-core >=1,<3"]
3
3
  build-backend = "poetry.core.masonry.api"
4
4
 
5
5
  [tool.poetry]
6
6
  name = "nitrokey"
7
- version = "0.2.2"
7
+ version = "0.2.4"
8
8
  description = "Nitrokey Python SDK"
9
9
  authors = ["Nitrokey <pypi@nitrokey.com>"]
10
10
  license = "Apache-2.0 or MIT"
@@ -18,6 +18,7 @@ packages = [
18
18
  ]
19
19
 
20
20
  [tool.poetry.dependencies]
21
+ cryptography = ">=41"
21
22
  fido2 = "^1.1.2"
22
23
  python = "^3.9"
23
24
  requests = "^2"
@@ -26,11 +27,9 @@ tlv8 = "^0.10"
26
27
 
27
28
  # lpc55
28
29
  crcmod = "^1.7"
29
- cryptography = ">=41"
30
30
  hidapi = "^0.14"
31
31
 
32
32
  # nrf52
33
- ecdsa = ">=0.18,<=0.19"
34
33
  protobuf = "^5.26"
35
34
  pyserial = "^3.5"
36
35
 
@@ -5,8 +5,11 @@
5
5
  # http://opensource.org/licenses/MIT>, at your option. This file may not be
6
6
  # copied, modified, or distributed except according to those terms.
7
7
 
8
- from fido2.hid import CtapHidDevice
8
+ from typing import List
9
9
 
10
+ from fido2.hid import CtapHidDevice, list_descriptors, open_device
11
+
12
+ from nitrokey import _VID_NITROKEY
10
13
  from nitrokey.trussed import Fido2Certs, TrussedDevice, Version
11
14
 
12
15
  FIDO2_CERTS = [
@@ -46,3 +49,20 @@ class NK3(TrussedDevice):
46
49
  @classmethod
47
50
  def from_device(cls, device: CtapHidDevice) -> "NK3":
48
51
  return cls(device)
52
+
53
+ @classmethod
54
+ def list(cls) -> List["NK3"]:
55
+ from . import _PID_NK3_DEVICE
56
+
57
+ descriptors = [
58
+ desc
59
+ for desc in list_descriptors() # type: ignore
60
+ if desc.vid == _VID_NITROKEY and desc.pid == _PID_NK3_DEVICE
61
+ ]
62
+
63
+ devices = []
64
+
65
+ # iterate on all descriptors found and open the device
66
+ for desc in descriptors:
67
+ devices.append(cls.from_device(open_device(desc.path)))
68
+ return devices
@@ -9,6 +9,7 @@ import enum
9
9
  import logging
10
10
  import platform
11
11
  import time
12
+ import warnings
12
13
  from abc import ABC, abstractmethod
13
14
  from contextlib import contextmanager
14
15
  from io import BytesIO
@@ -64,7 +65,7 @@ def get_extra_information(upath: UpdatePath) -> List[str]:
64
65
  "",
65
66
  "During this update process the internal filesystem will be migrated!",
66
67
  "- Migration will only work, if your internal filesystem does not contain more than 45 Resident Keys. If you have more please remove some.",
67
- "- After the update it might take up to 3minutes for the first boot.",
68
+ "- After the update it might take up to 3 minutes for the first boot.",
68
69
  "Never unplug the device while the LED is active!",
69
70
  ]
70
71
  return out
@@ -119,9 +120,11 @@ class UpdateUi(ABC):
119
120
  def confirm_update_same_version(self, version: Version) -> None:
120
121
  pass
121
122
 
122
- @abstractmethod
123
123
  def request_repeated_update(self) -> Optional[Exception]:
124
- pass
124
+ warnings.warn(
125
+ "UpdateUi.request_repeated_update is no longer needed", DeprecationWarning
126
+ )
127
+ return None
125
128
 
126
129
  @abstractmethod
127
130
  def pre_bootloader_hint(self) -> None:
@@ -324,13 +327,6 @@ class Updater:
324
327
  # needed for udev to properly handle new device
325
328
  time.sleep(1)
326
329
 
327
- maybe_exc = self.ui.request_repeated_update()
328
- if platform.system() == "Darwin" and maybe_exc is not None:
329
- # Currently there is an issue with device enumeration after reboot on macOS, see
330
- # <https://github.com/Nitrokey/pynitrokey/issues/145>. To avoid this issue, we
331
- # cancel the command now and ask the user to run it again.
332
- raise maybe_exc
333
-
334
330
  self.ui.pre_bootloader_hint()
335
331
 
336
332
  exc = None
@@ -7,7 +7,7 @@
7
7
 
8
8
  from typing import List, Optional, Sequence, Union
9
9
 
10
- from fido2.hid import CtapHidDevice
10
+ from fido2.hid import CtapHidDevice, list_descriptors, open_device
11
11
 
12
12
  from nitrokey import _VID_NITROKEY
13
13
  from nitrokey.trussed import Fido2Certs, TrussedDevice, Version
@@ -60,6 +60,21 @@ class NKPK(TrussedDevice):
60
60
  def from_device(cls, device: CtapHidDevice) -> "NKPK":
61
61
  return cls(device)
62
62
 
63
+ @classmethod
64
+ def list(cls) -> List["NKPK"]:
65
+ descriptors = [
66
+ desc
67
+ for desc in list_descriptors() # type: ignore
68
+ if desc.vid == _VID_NITROKEY and desc.pid == _PID_NKPK_DEVICE
69
+ ]
70
+
71
+ devices = []
72
+
73
+ # iterate on all descriptors found and open the device
74
+ for desc in descriptors:
75
+ devices.append(cls.from_device(open_device(desc.path)))
76
+ return devices
77
+
63
78
 
64
79
  class NKPKBootloader(TrussedBootloaderNrf52):
65
80
  @property
@@ -12,11 +12,12 @@ import time
12
12
  from abc import abstractmethod
13
13
  from dataclasses import dataclass
14
14
  from io import BytesIO
15
- from typing import Optional, Sequence, TypeVar, Union
15
+ from typing import Optional, Sequence, TypeVar
16
16
  from zipfile import ZipFile
17
17
 
18
- import ecdsa
19
- from ecdsa.keys import BadSignatureError
18
+ from cryptography.exceptions import InvalidSignature
19
+ from cryptography.hazmat.primitives import hashes, serialization
20
+ from cryptography.hazmat.primitives.asymmetric import ec, utils
20
21
 
21
22
  from nitrokey.trussed import Uuid, Version
22
23
 
@@ -45,18 +46,24 @@ class SignatureKey:
45
46
  # $ openssl ec -in dfu_public.pem -inform pem -pubin -outform der | xxd -p
46
47
  der: str
47
48
 
48
- def vk(self) -> ecdsa.VerifyingKey:
49
- return ecdsa.VerifyingKey.from_der(bytes.fromhex(self.der))
49
+ def public_key(self) -> ec.EllipticCurvePublicKey:
50
+ public_key = serialization.load_der_public_key(bytes.fromhex(self.der))
51
+ assert isinstance(public_key, ec.EllipticCurvePublicKey)
52
+ assert isinstance(public_key.curve, ec.SECP256R1)
53
+ return public_key
50
54
 
51
- def verify(self, signature: Union[bytes, str], message: Union[bytes, str]) -> bool:
55
+ def verify(self, signature: bytes, message: bytes) -> bool:
56
+ assert len(signature) == 64
57
+ r = int(signature[:32].hex(), 16)
58
+ s = int(signature[32:].hex(), 16)
52
59
  try:
53
- self.vk().verify(
54
- signature,
60
+ self.public_key().verify(
61
+ utils.encode_dss_signature(r, s),
55
62
  message,
56
- hashfunc=hashlib.sha256,
63
+ signature_algorithm=ec.ECDSA(hashes.SHA256()),
57
64
  )
58
65
  return True
59
- except BadSignatureError:
66
+ except InvalidSignature:
60
67
  return False
61
68
 
62
69
 
@@ -11,7 +11,7 @@ import platform
11
11
  import sys
12
12
  from abc import abstractmethod
13
13
  from enum import Enum
14
- from typing import Optional, Sequence, TypeVar, Union
14
+ from typing import List, Optional, Sequence, TypeVar, Union
15
15
 
16
16
  from fido2.hid import CtapHidDevice, open_device
17
17
 
@@ -110,15 +110,8 @@ class TrussedDevice(TrussedBase):
110
110
  return None
111
111
 
112
112
  @classmethod
113
- def list(cls: type[T]) -> list[T]:
114
- devices = []
115
- for device in CtapHidDevice.list_devices():
116
- try:
117
- devices.append(cls.from_device(device))
118
- except ValueError:
119
- # not the correct device type, skip
120
- pass
121
- return devices
113
+ @abstractmethod
114
+ def list(cls: type[T]) -> List[T]: ...
122
115
 
123
116
 
124
117
  def _device_path_to_str(path: Union[bytes, str]) -> str:
File without changes
File without changes
File without changes