diff options
author | pennae <82953136+pennae@users.noreply.github.com> | 2022-09-01 16:10:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-01 16:10:09 +0200 |
commit | 3bddcf5f9002814a8bec50025418faa3fd3f6138 (patch) | |
tree | 5ae3ebf10acce3ad00d4a2468f8e64c41a2c749b /pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch | |
parent | 1d41cff3dc4c8f37bb5841f51fcbff705e169178 (diff) | |
parent | e7312d54f184e5c3e0f1ef29028f6dae8fa34a97 (diff) | |
download | nixpkgs-3bddcf5f9002814a8bec50025418faa3fd3f6138.tar nixpkgs-3bddcf5f9002814a8bec50025418faa3fd3f6138.tar.gz nixpkgs-3bddcf5f9002814a8bec50025418faa3fd3f6138.tar.bz2 nixpkgs-3bddcf5f9002814a8bec50025418faa3fd3f6138.tar.lz nixpkgs-3bddcf5f9002814a8bec50025418faa3fd3f6138.tar.xz nixpkgs-3bddcf5f9002814a8bec50025418faa3fd3f6138.tar.zst nixpkgs-3bddcf5f9002814a8bec50025418faa3fd3f6138.zip |
Merge branch 'master' into option-docs-md
Diffstat (limited to 'pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch')
-rw-r--r-- | pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch b/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch new file mode 100644 index 00000000000..5be08f4ddbb --- /dev/null +++ b/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch @@ -0,0 +1,41 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 65a5943..e6932e0 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -30,7 +30,6 @@ packages = [ + python = "^3.6" + dataclasses = {version = "^0.8", python = "<3.7"} + cryptography = ">=2.1, <39" +-pyOpenSSL = {version = ">=0.15.1", optional = true} + pyscard = "^1.9 || ^2.0" + fido2 = ">=0.9, <2.0" + click = "^7.0 || ^8.0" +diff --git a/tests/test_util.py b/tests/test_util.py +index 6ccda6c..b4460e4 100644 +--- a/tests/test_util.py ++++ b/tests/test_util.py +@@ -8,7 +8,6 @@ from ykman.util import _parse_pkcs12_pyopenssl, _parse_pkcs12_cryptography + from ykman.otp import format_oath_code, generate_static_pw, time_challenge + from .util import open_file + from cryptography.hazmat.primitives.serialization import pkcs12 +-from OpenSSL import crypto + + import unittest + +@@ -114,16 +113,6 @@ class TestUtilityFunctions(unittest.TestCase): + ) as rsa_2048_key_cert_encrypted_pfx: + self.assertTrue(is_pkcs12(rsa_2048_key_cert_encrypted_pfx.read())) + +- def test_parse_pkcs12(self): +- with open_file("rsa_2048_key_cert.pfx") as rsa_2048_key_cert_pfx: +- data = rsa_2048_key_cert_pfx.read() +- +- key1, certs1 = _parse_pkcs12_cryptography(pkcs12, data, None) +- key2, certs2 = _parse_pkcs12_pyopenssl(crypto, data, None) +- self.assertEqual(key1.private_numbers(), key2.private_numbers()) +- self.assertEqual(1, len(certs1)) +- self.assertEqual(certs1, certs2) +- + def test_is_pem(self): + self.assertFalse(is_pem(b"just a byte string")) + self.assertFalse(is_pem(None)) |