Unverified Commit 110f464d authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #280995 from SuperSandro2000/yubikey-manager-qt

parents 5026f746 75457994
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
, qtbase
, qtgraphicaleffects
, qtquickcontrols2
, yubikey-manager4
, yubikey-manager
, yubikey-personalization
}:

@@ -18,8 +18,8 @@ mkDerivation rec {
  version = "1.2.5";

  src = fetchurl {
    url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
    sha256 = "sha256-6bKeR3UX2DhXGcKJ1bxvT1aLTgCfc+aNo6ckE89NV+I=";
    url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz";
    hash = "sha256-6bKeR3UX2DhXGcKJ1bxvT1aLTgCfc+aNo6ckE89NV+I=";
  };

  nativeBuildInputs = [
@@ -41,7 +41,7 @@ mkDerivation rec {
  ];

  pythonPath = [
    (yubikey-manager4.override { python3Packages = python3.pkgs; })
    (yubikey-manager.override { python3Packages = python3.pkgs; })
  ];

  postInstall = ''
+0 −71
Original line number Diff line number Diff line
{ python3Packages, fetchFromGitHub, lib, installShellFiles, yubikey-personalization, libu2f-host, libusb1, procps
, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:

python3Packages.buildPythonPackage rec {
  pname = "yubikey-manager";
  version = "4.0.9";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "Yubico";
    repo = "yubikey-manager";
    rev = "refs/tags/${version}";
    sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";
  };

  patches = lib.optionals (!pyOpenSSLSupport) [
    ./remove-pyopenssl-tests.patch
  ];

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace 'cryptography = ">=2.1, <39"' 'cryptography = ">=2.1"'
    substituteInPlace "ykman/pcsc/__init__.py" \
      --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'
  '';

  nativeBuildInputs = [ installShellFiles ]
    ++ (with python3Packages; [ poetry-core ]);

  propagatedBuildInputs = with python3Packages; ([
    click
    cryptography
    pyscard
    pyusb
    six
    fido2
  ] ++ lib.optionals pyOpenSSLSupport [
    pyopenssl
  ]) ++ [
    libu2f-host
    libusb1
    yubikey-personalization
  ];

  makeWrapperArgs = [
    "--prefix" "LD_LIBRARY_PATH" ":"
    (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ])
  ];

  postInstall = ''
    installManPage man/ykman.1

    mkdir -p $out/share/bash-completion/completions
    _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || :
    mkdir -p $out/share/zsh/site-functions/
    _YKMAN_COMPLETE=source_zsh "$out/bin/ykman" > "$out/share/zsh/site-functions/_ykman" || :
    substituteInPlace "$out/share/zsh/site-functions/_ykman" \
      --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"'
  '';

  nativeCheckInputs = with python3Packages; [ pytestCheckHook makefun ];

  meta = with lib; {
    homepage = "https://developers.yubico.com/yubikey-manager";
    description = "Previous release of command line tool for configuring any YubiKey over all USB transports";
    license = licenses.bsd2;
    platforms = platforms.unix;
    maintainers = with maintainers; [ benley lassulus pinpox ];
    mainProgram = "ykman";
  };
}
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec {

  postPatch = ''
    substituteInPlace "ykman/pcsc/__init__.py" \
      --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'
      --replace 'pkill' '${if stdenv.isLinux then procps else "/usr"}/bin/pkill'
  '';

  nativeBuildInputs = with python3Packages; [
+0 −41
Original line number Diff line number Diff line
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))
+1 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,7 @@ mapAliases ({
  yacc = bison; # moved from top-level 2021-03-14
  yafaray-core = libyafaray; # Added 2022-09-23
  yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04
  yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14
  yuzu-ea = yuzuPackages.early-access; # Added 2022-08-18
  yuzu-early-access = yuzuPackages.early-access; # Added 2023-12-29
  yuzu = yuzuPackages.mainline; # Added 2021-01-25
Loading