diff options
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/configuration.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/context.py | 4 | ||||
| -rw-r--r-- | pyecsca/ec/coordinates.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/curve.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/formula.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/key_agreement.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/key_generation.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/mod.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/model.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/mult.py | 8 | ||||
| -rw-r--r-- | pyecsca/ec/op.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/params.py | 4 | ||||
| -rw-r--r-- | pyecsca/ec/point.py | 2 | ||||
| -rw-r--r-- | pyecsca/ec/signature.py | 4 | ||||
| -rw-r--r-- | pyecsca/misc/cfg.py | 7 | ||||
| -rw-r--r-- | pyecsca/sca/scope/base.py | 2 | ||||
| -rw-r--r-- | pyecsca/sca/target/ISO7816.py | 4 | ||||
| -rw-r--r-- | pyecsca/sca/target/simpleserial.py | 2 | ||||
| -rw-r--r-- | pyecsca/sca/trace/trace.py | 2 | ||||
| -rw-r--r-- | pyecsca/sca/trace_set/base.py | 2 | ||||
| -rw-r--r-- | pyecsca/sca/trace_set/hdf5.py | 4 | ||||
| -rw-r--r-- | pyecsca/sca/trace_set/inspector.py | 2 | ||||
| -rw-r--r-- | test/ec/test_op.py | 1 |
24 files changed, 34 insertions, 34 deletions
diff --git a/docs/conf.py b/docs/conf.py index f8499fe..7f20953 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,7 @@ sys.path.insert(0, os.path.abspath('../notebook/')) # -- Project information ----------------------------------------------------- project = 'pyecsca' -copyright = '2018-2020, Jan Jancar' +copyright = '2018-2021, Jan Jancar' author = 'Jan Jancar' sys.path.append(os.path.abspath('..')) diff --git a/pyecsca/ec/configuration.py b/pyecsca/ec/configuration.py index e14b182..714f9b1 100644 --- a/pyecsca/ec/configuration.py +++ b/pyecsca/ec/configuration.py @@ -96,7 +96,7 @@ class RandomMod(EnumDefine): @public @dataclass(frozen=True) -class Configuration(object): +class Configuration: """An ECC implementation configuration.""" model: CurveModel diff --git a/pyecsca/ec/context.py b/pyecsca/ec/context.py index 0313f4b..5357907 100644 --- a/pyecsca/ec/context.py +++ b/pyecsca/ec/context.py @@ -22,7 +22,7 @@ from public import public @public -class Action(object): +class Action: """An Action.""" inside: bool @@ -245,7 +245,7 @@ _actual_context: ContextVar[Context] = ContextVar( ) -class _ContextManager(object): +class _ContextManager: def __init__(self, new_context): self.new_context = deepcopy(new_context) diff --git a/pyecsca/ec/coordinates.py b/pyecsca/ec/coordinates.py index 1797576..a9a8a8b 100644 --- a/pyecsca/ec/coordinates.py +++ b/pyecsca/ec/coordinates.py @@ -20,7 +20,7 @@ from .formula import ( @public -class CoordinateModel(object): +class CoordinateModel: """A coordinate system for a particular model(form) of an elliptic curve.""" name: str diff --git a/pyecsca/ec/curve.py b/pyecsca/ec/curve.py index 1140a04..4a14139 100644 --- a/pyecsca/ec/curve.py +++ b/pyecsca/ec/curve.py @@ -12,7 +12,7 @@ from .point import Point, InfinityPoint @public -class EllipticCurve(object): +class EllipticCurve: """Elliptic curve.""" model: CurveModel diff --git a/pyecsca/ec/formula.py b/pyecsca/ec/formula.py index efe87c0..c785166 100644 --- a/pyecsca/ec/formula.py +++ b/pyecsca/ec/formula.py @@ -17,7 +17,7 @@ from ..misc.cfg import getconfig @public -class OpResult(object): +class OpResult: """Result of an operation.""" parents: Tuple diff --git a/pyecsca/ec/key_agreement.py b/pyecsca/ec/key_agreement.py index 207923e..2141547 100644 --- a/pyecsca/ec/key_agreement.py +++ b/pyecsca/ec/key_agreement.py @@ -38,7 +38,7 @@ class ECDHAction(ResultAction): @public -class KeyAgreement(object): +class KeyAgreement: """EC based key agreement primitive (ECDH).""" mult: ScalarMultiplier diff --git a/pyecsca/ec/key_generation.py b/pyecsca/ec/key_generation.py index c379a81..abc963d 100644 --- a/pyecsca/ec/key_generation.py +++ b/pyecsca/ec/key_generation.py @@ -25,7 +25,7 @@ class KeygenAction(ResultAction): @public -class KeyGeneration(object): +class KeyGeneration: """ Key generator. diff --git a/pyecsca/ec/mod.py b/pyecsca/ec/mod.py index b5f71f4..68007dd 100644 --- a/pyecsca/ec/mod.py +++ b/pyecsca/ec/mod.py @@ -142,7 +142,7 @@ _mod_classes: Dict[str, Type] = {} @public -class Mod(object): +class Mod: """An element x of ℤₙ.""" x: Any diff --git a/pyecsca/ec/model.py b/pyecsca/ec/model.py index f0cba1a..c6305a6 100644 --- a/pyecsca/ec/model.py +++ b/pyecsca/ec/model.py @@ -10,7 +10,7 @@ from .coordinates import EFDCoordinateModel, CoordinateModel @public -class CurveModel(object): +class CurveModel: """Model(form) of an elliptic curve.""" name: str diff --git a/pyecsca/ec/mult.py b/pyecsca/ec/mult.py index 6588055..0841dc4 100644 --- a/pyecsca/ec/mult.py +++ b/pyecsca/ec/mult.py @@ -485,9 +485,9 @@ class BinaryNAFMultiplier(ScalarMultiplier): with ScalarMultiplicationAction(self._point, scalar) as action: if scalar == 0: return action.exit(copy(self._params.curve.neutral)) - bnaf = naf(scalar) + scalar_naf = naf(scalar) q = copy(self._params.curve.neutral) - for val in bnaf: + for val in scalar_naf: q = self._dbl(q) if val == 1: q = self._add(q, self._point) @@ -544,9 +544,9 @@ class WindowNAFMultiplier(ScalarMultiplier): with ScalarMultiplicationAction(self._point, scalar) as action: if scalar == 0: return action.exit(copy(self._params.curve.neutral)) - naf = wnaf(scalar, self.width) + scalar_naf = wnaf(scalar, self.width) q = copy(self._params.curve.neutral) - for val in naf: + for val in scalar_naf: q = self._dbl(q) if val > 0: q = self._add(q, self._points[val]) diff --git a/pyecsca/ec/op.py b/pyecsca/ec/op.py index bdfe553..406bd1f 100644 --- a/pyecsca/ec/op.py +++ b/pyecsca/ec/op.py @@ -45,7 +45,7 @@ class OpType(Enum): @public -class CodeOp(object): +class CodeOp: """Operation that can be executed.""" result: str diff --git a/pyecsca/ec/params.py b/pyecsca/ec/params.py index 81888c0..ab68a54 100644 --- a/pyecsca/ec/params.py +++ b/pyecsca/ec/params.py @@ -30,7 +30,7 @@ from ..misc.cfg import getconfig @public -class DomainParameters(object): +class DomainParameters: """Domain parameters which specify a subgroup on an elliptic curve.""" curve: EllipticCurve @@ -86,7 +86,7 @@ class DomainParameters(object): @public -class DomainParameterCategory(object): +class DomainParameterCategory: """A category of domain parameters.""" name: str diff --git a/pyecsca/ec/point.py b/pyecsca/ec/point.py index a509db2..b12b312 100644 --- a/pyecsca/ec/point.py +++ b/pyecsca/ec/point.py @@ -35,7 +35,7 @@ class CoordinateMappingAction(ResultAction): @public -class Point(object): +class Point: """A point with coordinates in a coordinate model.""" coordinate_model: CoordinateModel diff --git a/pyecsca/ec/signature.py b/pyecsca/ec/signature.py index d85d58f..972af19 100644 --- a/pyecsca/ec/signature.py +++ b/pyecsca/ec/signature.py @@ -14,7 +14,7 @@ from .point import Point @public -class SignatureResult(object): +class SignatureResult: """ECDSA signature result (r, s).""" r: int @@ -111,7 +111,7 @@ class ECDSAVerifyAction(ECDSAAction): @public -class Signature(object): +class Signature: """EC based signature primitive (ECDSA).""" mult: ScalarMultiplier diff --git a/pyecsca/misc/cfg.py b/pyecsca/misc/cfg.py index 82cb387..24b83f8 100644 --- a/pyecsca/misc/cfg.py +++ b/pyecsca/misc/cfg.py @@ -10,7 +10,7 @@ from public import public @public -class ECConfig(object): +class ECConfig: """Configuration for the :py:mod:`pyecsca.ec` package.""" _no_inverse_action: str = "error" @@ -121,7 +121,7 @@ class ECConfig(object): @public -class Config(object): +class Config: """Runtime configuration for the library.""" ec: ECConfig @@ -166,7 +166,7 @@ def resetconfig(token: Token) -> None: @public -class TemporaryConfig(object): +class TemporaryConfig: """ Temporary config context manager. @@ -180,6 +180,7 @@ class TemporaryConfig(object): """ def __init__(self): + self.token = None self.new_config = deepcopy(getconfig()) def __enter__(self) -> Config: diff --git a/pyecsca/sca/scope/base.py b/pyecsca/sca/scope/base.py index ced3009..76b1272 100644 --- a/pyecsca/sca/scope/base.py +++ b/pyecsca/sca/scope/base.py @@ -16,7 +16,7 @@ class SampleType(Enum): @public -class Scope(object): +class Scope: """An oscilloscope.""" def open(self) -> None: diff --git a/pyecsca/sca/target/ISO7816.py b/pyecsca/sca/target/ISO7816.py index 8da06f8..cca09d5 100644 --- a/pyecsca/sca/target/ISO7816.py +++ b/pyecsca/sca/target/ISO7816.py @@ -10,7 +10,7 @@ from .base import Target @public @dataclass -class CommandAPDU(object): # pragma: no cover +class CommandAPDU: # pragma: no cover """Command APDU that can be sent to an ISO7816-4 target.""" cls: int @@ -79,7 +79,7 @@ class CommandAPDU(object): # pragma: no cover @public @dataclass -class ResponseAPDU(object): +class ResponseAPDU: """Response APDU that can be received from an ISO7816-4 target.""" data: bytes diff --git a/pyecsca/sca/target/simpleserial.py b/pyecsca/sca/target/simpleserial.py index a28672e..882ac93 100644 --- a/pyecsca/sca/target/simpleserial.py +++ b/pyecsca/sca/target/simpleserial.py @@ -8,7 +8,7 @@ from .serial import SerialTarget @public -class SimpleSerialMessage(object): +class SimpleSerialMessage: """A SimpleSerial message consisting of a starting character and a hexadecimal string.""" char: str diff --git a/pyecsca/sca/trace/trace.py b/pyecsca/sca/trace/trace.py index 27462c7..4ddad23 100644 --- a/pyecsca/sca/trace/trace.py +++ b/pyecsca/sca/trace/trace.py @@ -9,7 +9,7 @@ from public import public @public -class Trace(object): +class Trace: """Trace, which has some samples and metadata.""" meta: Mapping[str, Any] diff --git a/pyecsca/sca/trace_set/base.py b/pyecsca/sca/trace_set/base.py index e0224fb..d2e5791 100644 --- a/pyecsca/sca/trace_set/base.py +++ b/pyecsca/sca/trace_set/base.py @@ -8,7 +8,7 @@ from ..trace import Trace @public -class TraceSet(object): +class TraceSet: """Set of traces with some metadata.""" _traces: List[Trace] diff --git a/pyecsca/sca/trace_set/hdf5.py b/pyecsca/sca/trace_set/hdf5.py index bd3521b..63620c3 100644 --- a/pyecsca/sca/trace_set/hdf5.py +++ b/pyecsca/sca/trace_set/hdf5.py @@ -181,8 +181,8 @@ class HDF5TraceSet(TraceSet): dset = hdf5.create_dataset(k, data=trace.samples) if trace.meta: meta = HDF5Meta(dset.attrs) - for k, v in trace.meta.items(): - meta[k] = v + for key, val in trace.meta.items(): + meta[key] = val hdf5.close() def __repr__(self): diff --git a/pyecsca/sca/trace_set/inspector.py b/pyecsca/sca/trace_set/inspector.py index 101ab2a..00e8273 100644 --- a/pyecsca/sca/trace_set/inspector.py +++ b/pyecsca/sca/trace_set/inspector.py @@ -27,7 +27,7 @@ class SampleCoding(IntEnum): @public -class Parsers(object): +class Parsers: @staticmethod def read_int(bytes): return int.from_bytes(bytes, byteorder="little") diff --git a/test/ec/test_op.py b/test/ec/test_op.py index 77669fb..e418350 100644 --- a/test/ec/test_op.py +++ b/test/ec/test_op.py @@ -1,4 +1,3 @@ -import ast from ast import parse from unittest import TestCase |
