Dependencies: remove block on cryptography (ivre#1550)

* Dependencies: remove block on cryptography * Utils: fix mac2manuf for newest file format
jbgalet · Jul 20, 2023 · fac8730 · fac8730
1 parent bb346c4
commit fac8730
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 12 deletions.
diff --git a/ivre/utils.py b/ivre/utils.py
@@ -1530,6 +1530,8 @@ def _int2macmask(mask: int) -> int:
 def _read_wireshark_manuf_db() -> None:
     global _WIRESHARK_MANUF_DB_POPULATED
 
+    sep = re.compile("\t+")
+
     if config.WIRESHARK_SHARE_PATH is None:
         return
 
@@ -1542,10 +1544,10 @@ def parse_line(line: str) -> None:
             return
         comment: Optional[str]
         try:
-            addr, manuf, comment = line.split("\t", 2)
+            addr, manuf, comment = sep.split(line, 2)
         except ValueError:
             try:
-                addr, manuf = line.split("\t", 1)
+                addr, manuf = sep.split(line, 1)
             except ValueError:
                 LOGGER.warning(
                     "Cannot parse a line from Wireshark manufacturer database [%r].",

diff --git a/requirements-all.txt b/requirements-all.txt
@@ -2,7 +2,7 @@ bandit
 black
 bottle
 codespell
-cryptography<40.0.0
+cryptography
 docutils!=0.18
 elasticsearch
 elasticsearch-dsl

diff --git a/requirements-elastic.txt b/requirements-elastic.txt
@@ -1,5 +1,5 @@
 elasticsearch
 elasticsearch-dsl
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/requirements-maxmind.txt b/requirements-maxmind.txt
@@ -1,4 +1,4 @@
 pymongo>=3.7
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/requirements-mongo.txt b/requirements-mongo.txt
@@ -1,4 +1,4 @@
 pymongo>=3.7
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/requirements-mongosrv.txt b/requirements-mongosrv.txt
@@ -1,4 +1,4 @@
 pymongo[srv]>=3.7
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/requirements-postgres.txt b/requirements-postgres.txt
@@ -1,5 +1,5 @@
 sqlalchemy<2
 psycopg2
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/requirements-sqlite.txt b/requirements-sqlite.txt
@@ -1,4 +1,4 @@
 sqlalchemy<2
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/requirements-tinydb.txt b/requirements-tinydb.txt
@@ -1,4 +1,4 @@
 tinydb
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 pymongo>=3.7
-cryptography<40.0.0
+cryptography
 pyOpenSSL>=16.1.0
 bottle
diff --git a/tests/tests.py b/tests/tests.py
@@ -4399,7 +4399,7 @@ def is_prime(n):
         for mac, res in [
             (
                 "00:00:00:00:00:00",
-                ("00:00:00", "Officially Xerox, but 0:0:0:0:0:0 is more common"),
+                ("Xerox", "Xerox Corporation"),
             ),
             ("00:00:01:00:00:00", ("Xerox", "Xerox Corporation")),
             ("00:01:01:00:00:00", ("Private", None)),