Merge pull request #420 from romanz/fixup

Remove unused imports and fix a small lint issue
romanz · Apr 25, 2023 · 23a48e4 · 23a48e4
2 parents 58bbb24 + 9741630
commit 23a48e4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 43 deletions.
diff --git a/libagent/age/__init__.py b/libagent/age/__init__.py
@@ -9,21 +9,17 @@
 
 import argparse
 import base64
-import contextlib
-import datetime
 import io
 import logging
 import os
 import sys
-import traceback
 
 import bech32
 import pkg_resources
-import semver
 from cryptography.exceptions import InvalidTag
 from cryptography.hazmat.primitives.ciphers.aead import ChaCha20Poly1305
 
-from .. import device, server, util
+from .. import device, util
 from . import client
 
 log = logging.getLogger(__name__)

diff --git a/libagent/device/onlykey.py b/libagent/device/onlykey.py
@@ -159,35 +159,35 @@ def pubkey(self, identity, ecdh=False):
                 else:
                     vk = ecdsa.VerifyingKey.from_string(ok_pubkey, curve=ecdsa.SECP256k1)
                 return vk
-        else:
-            ok_pubkey = []
-            while time.time() < t_end:
-                try:
-                    ok_pub_part = self.ok.read_bytes(timeout_ms=100)
-                    if len(ok_pub_part) == 64 and len(set(ok_pub_part[0:63])) != 1:
-                        log.info('received part= %s', repr(ok_pub_part))
-                        ok_pubkey += ok_pub_part
-                        # Todo know RSA type to know how many packets
-                except Exception as e:
-                    raise interface.DeviceError(e)
 
-            log.info('received= %s', repr(ok_pubkey))
-            if len(ok_pubkey) == 256:
-                # https://security.stackexchange.com/questions/42268/how-do-i-get-the-rsa-bit-length-with-the-pubkey-and-openssl
-                ok_pubkey = b'\x00\x00\x00\x07' + b'\x73\x73\x68\x2d\x72\x73\x61' + \
-                                                b'\x00\x00\x00\x03' + b'\x01\x00\x01' + \
-                                                b'\x00\x00\x01\x01' + b'\x00' + bytes(ok_pubkey)
-                # ok_pubkey = b'\x00\x00\x00\x07' + b'\x72\x73\x61\x2d\x73\x68\x61\x32\x2d\x32\x35\x
-                # 36' + b'\x00\x00\x00\x03' + b'\x01\x00\x01' + b'\x00\x00\x01\x01' + b'\x00' + byte
-                # s(ok_pubkey)
-            elif len(ok_pubkey) == 512:
-                ok_pubkey = b'\x00\x00\x00\x07' + b'\x73\x73\x68\x2d\x72\x73\x61' + \
-                                                b'\x00\x00\x00\x03' + b'\x01\x00\x01' + \
-                                                b'\x00\x00\x02\x01' + b'\x00' + bytes(ok_pubkey)
-            else:
-                raise interface.DeviceError("Error response length is not a valid public key")
-            log.info('pubkey len = %s', len(ok_pubkey))
-            return ok_pubkey
+        ok_pubkey = []
+        while time.time() < t_end:
+            try:
+                ok_pub_part = self.ok.read_bytes(timeout_ms=100)
+                if len(ok_pub_part) == 64 and len(set(ok_pub_part[0:63])) != 1:
+                    log.info('received part= %s', repr(ok_pub_part))
+                    ok_pubkey += ok_pub_part
+                    # Todo know RSA type to know how many packets
+            except Exception as e:
+                raise interface.DeviceError(e)
+
+        log.info('received= %s', repr(ok_pubkey))
+        if len(ok_pubkey) == 256:
+            # https://security.stackexchange.com/questions/42268/how-do-i-get-the-rsa-bit-length-with-the-pubkey-and-openssl
+            ok_pubkey = b'\x00\x00\x00\x07' + b'\x73\x73\x68\x2d\x72\x73\x61' + \
+                                            b'\x00\x00\x00\x03' + b'\x01\x00\x01' + \
+                                            b'\x00\x00\x01\x01' + b'\x00' + bytes(ok_pubkey)
+            # ok_pubkey = b'\x00\x00\x00\x07' + b'\x72\x73\x61\x2d\x73\x68\x61\x32\x2d\x32\x35\x
+            # 36' + b'\x00\x00\x00\x03' + b'\x01\x00\x01' + b'\x00\x00\x01\x01' + b'\x00' + byte
+            # s(ok_pubkey)
+        elif len(ok_pubkey) == 512:
+            ok_pubkey = b'\x00\x00\x00\x07' + b'\x73\x73\x68\x2d\x72\x73\x61' + \
+                                            b'\x00\x00\x00\x03' + b'\x01\x00\x01' + \
+                                            b'\x00\x00\x02\x01' + b'\x00' + bytes(ok_pubkey)
+        else:
+            raise interface.DeviceError("Error response length is not a valid public key")
+        log.info('pubkey len = %s', len(ok_pubkey))
+        return ok_pubkey
 
     def sign(self, identity, blob):
         """Sign given blob and return the signature (as bytes)."""

diff --git a/libagent/signify/__init__.py b/libagent/signify/__init__.py
@@ -2,21 +2,12 @@
 
 import argparse
 import binascii
-import contextlib
-import functools
 import hashlib
 import logging
-import os
-import re
-import struct
-import subprocess
 import sys
 import time
 
-import pkg_resources
-import semver
-
-from .. import formats, server, util
+from .. import util
 from ..device import interface, ui
 
 log = logging.getLogger(__name__)