Merge pull request #148 from duo-labs/deps/update-cryptography

feps/update-cryptography
duo-labs · Feb 17, 2023 · c49712e · c49712e
2 parents c6fec4f + e4573a6
commit c49712e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ black==21.9b0
 cbor2==5.4.2.post1
 cffi==1.15.0
 click==8.0.3
-cryptography==36.0.1
+cryptography==39.0.1
 mccabe==0.6.1
 mypy==0.910
 mypy-extensions==0.4.3
@@ -13,7 +13,7 @@ pycodestyle==2.8.0
 pycparser==2.20
 pydantic==1.9.0
 pyflakes==2.4.0
-pyOpenSSL==22.0.0
+pyOpenSSL==23.0.0
 regex==2021.10.8
 six==1.16.0
 toml==0.10.2

diff --git a/tests/test_validate_certificate_chain.py b/tests/test_validate_certificate_chain.py
@@ -50,6 +50,7 @@ def test_throws_on_bad_root_cert(self, mock_verify_certificate: MagicMock) -> No
         )
         mock_verify_certificate.side_effect = X509StoreContextError(
             "bad root cert",
+            [],
             root_cert_x509,
         )
 

diff --git a/webauthn/registration/formats/tpm.py b/webauthn/registration/formats/tpm.py
@@ -250,7 +250,7 @@ def verify_tpm(
     for obj in tcg_at_tpm_values:
         oid = obj.oid.dotted_string
         if oid == "2.23.133.2.1":
-            tcg_at_tpm_manufacturer = obj.value
+            tcg_at_tpm_manufacturer = str(obj.value)
         elif oid == "2.23.133.2.2":
             tcg_at_tpm_model = obj.value
         elif oid == "2.23.133.2.3":
-Original file line number
+Diff line change
@@ Expand Up @@
             )
             mock_verify_certificate.side_effect = X509StoreContextError(
                 "bad root cert",
+                [],
                 root_cert_x509,
             )
@@ Expand Down @@