The first part is an update of py-fido2 to 0.9.3. The second part
updates yubikey-manager to 4.0.8 and makes it use the py-fido2 port
again. Contrary to the comment in py-fido2, this does not require an
update of py-click.
With this, I can manage the FIDO application on my YubiKey, set a
PIN and find out if there's an SSH key stored. I can also access what
is there in terms of OpenPGP and PIV functionality. That's an improvement.
However, OTP slot management does not work anymore. That's a
regression. The reason is that ykman now tries to access this
functionality via the raw uhid device on Linux and there's no backend to
do this on OpenBSD. Even if one were to write a backend mimicking the
functionality, it would require chown'ing device nodes.
I don't know if updating it is a good idea.
More tests and feedback appreciated.
Index: security/py-fido2/Makefile
===================================================================
RCS file: /home/cvs/ports/security/py-fido2/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- security/py-fido2/Makefile 11 Mar 2022 19:53:55 -0000 1.7
+++ security/py-fido2/Makefile 29 May 2022 12:14:24 -0000
@@ -1,19 +1,9 @@
COMMENT = Python module to communicate with USB FIDO devices
-# using github for now, it has support for OpenBSD; should be ok to move back
-# to pypi for the next release.
-# updating this to 0.9 requires an update in security/yubico/yubikey-manager,
-# which in turn needs an update of py-click.
-GH_ACCOUNT = Yubico
-GH_PROJECT = python-fido2
-GH_COMMIT = 46a0b649b9aa9af79566e6e3961021e070d98b1c
-
-MODPY_EGG_VERSION = 0.8.2.dev0
-
-#DISTNAME = fido2-${MODPY_EGG_VERSION}
-#PKGNAME = py-${DISTNAME}
-DISTNAME = py-fido2-0.8.2pre20200313
-REVISION = 1
+MODPY_EGG_VERSION = 0.9.3
+
+DISTNAME = fido2-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME}
CATEGORIES = security
@@ -26,7 +16,7 @@ MODULES = lang/python
FLAVOR = python3
FLAVORS = python3
-#MODPY_PI = Yes
+MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
RUN_DEPENDS = security/py-cryptography${MODPY_FLAVOR} \
Index: security/py-fido2/distinfo
===================================================================
RCS file: /home/cvs/ports/security/py-fido2/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- security/py-fido2/distinfo 23 May 2020 21:55:55 -0000 1.3
+++ security/py-fido2/distinfo 29 May 2022 12:14:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (py-fido2-0.8.2pre20200313-46a0b649.tar.gz) =
WH4RUQ6IOeruJ8Zp0iBIaI6buEPJmdvU8mPpXXhrPu4=
-SIZE (py-fido2-0.8.2pre20200313-46a0b649.tar.gz) = 210085
+SHA256 (fido2-0.9.3.tar.gz) = tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw=
+SIZE (fido2-0.9.3.tar.gz) = 217894
Index: security/py-fido2/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/security/py-fido2/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- security/py-fido2/pkg/PLIST 11 Mar 2022 19:53:55 -0000 1.4
+++ security/py-fido2/pkg/PLIST 29 May 2022 12:15:17 -0000
@@ -9,16 +9,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/fido2/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}_tpm.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}attestation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}cbor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}cose.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}ctap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}ctap1.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}ctap2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}hid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}mds.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}nfc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}pcsc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}rpid.${MODPY_PYC_MAGIC_TAG}pyc
@@ -26,34 +22,62 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}webauthn.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}win_api.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}hidtransport.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}openbsd.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/base.py
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/freebsd.py
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/hidtransport.py
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/linux.py
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/macos.py
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/openbsd.py
-lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/windows.py
-lib/python${MODPY_VERSION}/site-packages/fido2/_tpm.py
-lib/python${MODPY_VERSION}/site-packages/fido2/attestation.py
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}android.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}packed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}tpm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}u2f.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/android.py
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/apple.py
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/base.py
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/packed.py
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/tpm.py
+lib/python${MODPY_VERSION}/site-packages/fido2/attestation/u2f.py
lib/python${MODPY_VERSION}/site-packages/fido2/cbor.py
lib/python${MODPY_VERSION}/site-packages/fido2/client.py
lib/python${MODPY_VERSION}/site-packages/fido2/cose.py
lib/python${MODPY_VERSION}/site-packages/fido2/ctap.py
lib/python${MODPY_VERSION}/site-packages/fido2/ctap1.py
-lib/python${MODPY_VERSION}/site-packages/fido2/ctap2.py
-lib/python${MODPY_VERSION}/site-packages/fido2/extensions.py
-lib/python${MODPY_VERSION}/site-packages/fido2/hid.py
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}bio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}blob.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}credman.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}pin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/base.py
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/bio.py
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/blob.py
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/config.py
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/credman.py
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/extensions.py
+lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/pin.py
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}openbsd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/base.py
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/freebsd.py
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/linux.py
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/macos.py
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/openbsd.py
+lib/python${MODPY_VERSION}/site-packages/fido2/hid/windows.py
+lib/python${MODPY_VERSION}/site-packages/fido2/mds.py
lib/python${MODPY_VERSION}/site-packages/fido2/nfc.py
lib/python${MODPY_VERSION}/site-packages/fido2/pcsc.py
lib/python${MODPY_VERSION}/site-packages/fido2/public_suffix_list.dat
@@ -66,9 +90,15 @@ share/examples/${MODPY_PY_PREFIX}fido2/
share/examples/${MODPY_PY_PREFIX}fido2/acr122u.py
share/examples/${MODPY_PY_PREFIX}fido2/acr122usam.py
share/examples/${MODPY_PY_PREFIX}fido2/acr1252u.py
+share/examples/${MODPY_PY_PREFIX}fido2/bio_enrollment.py
+share/examples/${MODPY_PY_PREFIX}fido2/cred_blob.py
share/examples/${MODPY_PY_PREFIX}fido2/credential.py
share/examples/${MODPY_PY_PREFIX}fido2/get_info.py
share/examples/${MODPY_PY_PREFIX}fido2/hmac_secret.py
+share/examples/${MODPY_PY_PREFIX}fido2/large_blobs.py
+share/examples/${MODPY_PY_PREFIX}fido2/min_pin_length.py
share/examples/${MODPY_PY_PREFIX}fido2/multi_device.py
share/examples/${MODPY_PY_PREFIX}fido2/resident_key.py
+share/examples/${MODPY_PY_PREFIX}fido2/test_config.py
share/examples/${MODPY_PY_PREFIX}fido2/u2f_nfc.py
+share/examples/${MODPY_PY_PREFIX}fido2/verify_attestation.py
Index: security/yubico/yubikey-manager/Makefile
===================================================================
RCS file: /home/cvs/ports/security/yubico/yubikey-manager/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- security/yubico/yubikey-manager/Makefile 11 Mar 2022 19:54:10 -0000
1.14
+++ security/yubico/yubikey-manager/Makefile 29 May 2022 17:29:21 -0000
@@ -4,19 +4,13 @@ COMMENT = library and CLI tool (ykman) f
# doesn't work directly with openbsd's usb stack
PORTROACH = site:https://github.com/Yubico/yubikey-manager/releases/
-MODPY_EGG_VERSION = 3.1.2
-REVISION = 4
+MODPY_EGG_VERSION = 4.0.8
GH_ACCOUNT = Yubico
GH_PROJECT = yubikey-manager
-GH_TAGNAME = yubikey-manager-${MODPY_EGG_VERSION}
+GH_TAGNAME = ${MODPY_EGG_VERSION}
-DISTNAME = ${GH_TAGNAME}
-YK_PROJECT = yubikey-manager
-
-MASTER_SITES0 = https://github.com/Yubico/python-fido2/archive/
-DISTFILES = ${GH_DISTFILE} \
-
py-fido2-0.8.2pre20200313-46a0b649.tar.gz{46a0b649b9aa9af79566e6e3961021e070d98b1c.tar.gz}:0
+MASTER_SITES =
https://github.com/Yubico/yubikey-manager/releases/download/${MODPY_EGG_VERSION}/
CATEGORIES = sysutils
@@ -25,21 +19,14 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
-WANTLIB += ykpers-1 # dlopen()'d
-
BUILD_DEPENDS = devel/swig
-LIB_DEPENDS = security/yubico/yubikey-personalization
RUN_DEPENDS = devel/py-click${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
- devel/pyusb${MODPY_FLAVOR} \
security/pcsc-lite \
security/py-cryptography${MODPY_FLAVOR} \
+ security/py-fido2${MODPY_FLAVOR} \
security/py-openssl${MODPY_FLAVOR} \
security/py-pyscard${MODPY_FLAVOR}
-
-post-extract:
- mv ${WRKDIR}/python-fido2-*/fido2 ${WRKSRC}/ykman/
- rm -r ${WRKDIR}/python-fido2-*
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/man/man1
Index: security/yubico/yubikey-manager/distinfo
===================================================================
RCS file: /home/cvs/ports/security/yubico/yubikey-manager/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- security/yubico/yubikey-manager/distinfo 16 Feb 2022 16:35:09 -0000
1.4
+++ security/yubico/yubikey-manager/distinfo 29 May 2022 17:29:26 -0000
@@ -1,4 +1,2 @@
-SHA256 (py-fido2-0.8.2pre20200313-46a0b649.tar.gz) =
WH4RUQ6IOeruJ8Zp0iBIaI6buEPJmdvU8mPpXXhrPu4=
-SHA256 (yubikey-manager-yubikey-manager-3.1.2.tar.gz) =
XTnIqJIsLl7iLECjVcz8eo0j7LNZRZjafAuNcZb0Yr0=
-SIZE (py-fido2-0.8.2pre20200313-46a0b649.tar.gz) = 210085
-SIZE (yubikey-manager-yubikey-manager-3.1.2.tar.gz) = 119291
+SHA256 (yubikey-manager-4.0.8.tar.gz) =
9I33DfFBAS8lDxo/dbTjNu7Lqpzn+C4eKAHdmYnv+H4=
+SIZE (yubikey-manager-4.0.8.tar.gz) = 147076
Index: security/yubico/yubikey-manager/patches/patch-setup_py
===================================================================
RCS file: security/yubico/yubikey-manager/patches/patch-setup_py
diff -N security/yubico/yubikey-manager/patches/patch-setup_py
--- security/yubico/yubikey-manager/patches/patch-setup_py 11 Mar 2022
19:54:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -31,7 +31,7 @@ from setuptools import setup
-
- install_requires = [
- 'six', 'pyscard', 'pyusb', 'click',
-- 'cryptography', 'pyopenssl', 'fido2 >= 0.7, < 0.9'
-+ 'cryptography', 'pyopenssl'
- ]
- tests_require = []
- if sys.version_info < (3, 3):
-@@ -60,7 +60,8 @@ setup(
- 'console_scripts': ['ykman=ykman.cli.__main__:main'],
- },
- packages=[
-- 'ykman', 'ykman.native', 'ykman.scancodes', 'ykman.cli'],
-+ 'ykman', 'ykman.native', 'ykman.scancodes', 'ykman.cli',
-+ 'ykman.cli', 'ykman.fido2', 'ykman.fido2._pyu2f'],
- install_requires=install_requires,
- package_data={'ykman': ['VERSION']},
- include_package_data=True,
Index: security/yubico/yubikey-manager/patches/patch-test_util_py
===================================================================
RCS file: security/yubico/yubikey-manager/patches/patch-test_util_py
diff -N security/yubico/yubikey-manager/patches/patch-test_util_py
--- security/yubico/yubikey-manager/patches/patch-test_util_py 11 Mar 2022
19:54:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-cryptography.utils.int_from_bytes deprecated
-
-Index: test/util.py
---- test/util.py.orig
-+++ test/util.py
-@@ -8,7 +8,6 @@ from cryptography.hazmat.backends import default_backe
- from cryptography.hazmat.primitives import hashes
- from cryptography.hazmat.primitives.asymmetric import ec
- from cryptography.hazmat.primitives.serialization import Encoding
--from cryptography.utils import int_from_bytes
- from cryptography.x509.oid import NameOID
- from ykman.cli.__main__ import cli
- from ykman.util import Tlv
-@@ -80,7 +79,7 @@ def generate_self_signed_certificate(
- x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, common_name), ]))
-
- # x509.random_serial_number added in cryptography 1.6
-- serial = int_from_bytes(os.urandom(20), 'big') >> 1
-+ serial = int.from_bytes(os.urandom(20), 'big') >> 1
- builder = builder.serial_number(serial)
-
- builder = builder.not_valid_before(valid_from)
Index: security/yubico/yubikey-manager/patches/patch-ykman_cli_fido_py
===================================================================
RCS file: security/yubico/yubikey-manager/patches/patch-ykman_cli_fido_py
diff -N security/yubico/yubikey-manager/patches/patch-ykman_cli_fido_py
--- security/yubico/yubikey-manager/patches/patch-ykman_cli_fido_py 11 Mar
2022 19:54:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: ykman/cli/fido.py
---- ykman/cli/fido.py.orig
-+++ ykman/cli/fido.py
-@@ -28,8 +28,8 @@
- from __future__ import absolute_import
- import click
- import logging
--from fido2.ctap1 import ApduError
--from fido2.ctap import CtapError
-+from ..fido2.ctap1 import ApduError
-+from ..fido2.ctap import CtapError
- from time import sleep
- from .util import click_postpone_execution, prompt_for_touch,
click_force_option
- from ..driver_ccid import SW
Index: security/yubico/yubikey-manager/patches/patch-ykman_driver_fido_py
===================================================================
RCS file: security/yubico/yubikey-manager/patches/patch-ykman_driver_fido_py
diff -N security/yubico/yubikey-manager/patches/patch-ykman_driver_fido_py
--- security/yubico/yubikey-manager/patches/patch-ykman_driver_fido_py 11 Mar
2022 19:54:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: ykman/driver_fido.py
---- ykman/driver_fido.py.orig
-+++ ykman/driver_fido.py
-@@ -29,7 +29,7 @@ from __future__ import absolute_import
-
- from .driver import AbstractDriver, NotSupportedError
- from .util import TRANSPORT, PID, YUBIKEY, Mode
--from fido2.hid import CtapHidDevice, CTAPHID
-+from .fido2.hid import CtapHidDevice, CTAPHID
- from enum import IntEnum, unique
- import logging
- import struct
Index: security/yubico/yubikey-manager/patches/patch-ykman_fido_py
===================================================================
RCS file: security/yubico/yubikey-manager/patches/patch-ykman_fido_py
diff -N security/yubico/yubikey-manager/patches/patch-ykman_fido_py
--- security/yubico/yubikey-manager/patches/patch-ykman_fido_py 11 Mar 2022
19:54:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: ykman/fido.py
---- ykman/fido.py.orig
-+++ ykman/fido.py
-@@ -30,8 +30,8 @@ from __future__ import absolute_import
- import six
- import time
- import logging
--from fido2.ctap1 import CTAP1, ApduError
--from fido2.ctap2 import CTAP2, PinProtocolV1, CredentialManagement
-+from .fido2.ctap1 import CTAP1, ApduError
-+from .fido2.ctap2 import CTAP2, PinProtocolV1, CredentialManagement
- from threading import Timer
- from .driver_ccid import SW
- from .driver_fido import FIPS_U2F_CMD
Index: security/yubico/yubikey-manager/patches/patch-ykman_opgp_py
===================================================================
RCS file: security/yubico/yubikey-manager/patches/patch-ykman_opgp_py
diff -N security/yubico/yubikey-manager/patches/patch-ykman_opgp_py
--- security/yubico/yubikey-manager/patches/patch-ykman_opgp_py 11 Mar 2022
19:54:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-cryptography.utils.int_from_bytes deprecated
-
-Index: ykman/opgp.py
---- ykman/opgp.py.orig
-+++ ykman/opgp.py
-@@ -37,7 +37,7 @@ from enum import Enum, IntEnum, unique
- from binascii import b2a_hex
- from collections import namedtuple
- from cryptography import x509
--from cryptography.utils import int_to_bytes, int_from_bytes
-+from cryptography.utils import int_to_bytes
- from cryptography.hazmat.backends import default_backend
- from cryptography.hazmat.primitives.serialization import (
- Encoding, PrivateFormat, NoEncryption
-@@ -407,8 +407,8 @@ class OpgpController(object):
-
- data = Tlv.parse_dict(Tlv.unpack(0x7f49, resp))
- numbers = rsa.RSAPublicNumbers(
-- int_from_bytes(data[0x82], 'big'),
-- int_from_bytes(data[0x81], 'big')
-+ int.from_bytes(data[0x82], 'big'),
-+ int.from_bytes(data[0x81], 'big')
- )
-
- self._put_data(key_slot.gen_time, struct.pack('>I', timestamp))
Index: security/yubico/yubikey-manager/patches/patch-ykman_piv_py
===================================================================
RCS file: security/yubico/yubikey-manager/patches/patch-ykman_piv_py
diff -N security/yubico/yubikey-manager/patches/patch-ykman_piv_py
--- security/yubico/yubikey-manager/patches/patch-ykman_piv_py 11 Mar 2022
19:54:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-cryptography.utils.int_from_bytes deprecated
-
-Index: ykman/piv.py
---- ykman/piv.py.orig
-+++ ykman/piv.py
-@@ -36,7 +36,7 @@ from .util import (
- ensure_not_cve201715361_vulnerable_firmware_version)
- from cryptography import x509
- from cryptography.exceptions import InvalidSignature
--from cryptography.utils import int_to_bytes, int_from_bytes
-+from cryptography.utils import int_to_bytes
- from cryptography.hazmat.primitives import hashes
- from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
- from cryptography.hazmat.primitives.constant_time import bytes_eq
-@@ -794,8 +794,8 @@ class PivController(object):
- key_data = Tlv.parse_dict(Tlv.unpack(0x7f49, resp))
- if algorithm in [ALGO.RSA1024, ALGO.RSA2048]:
- return rsa.RSAPublicNumbers(
-- int_from_bytes(key_data[0x82], 'big'),
-- int_from_bytes(key_data[0x81], 'big')
-+ int.from_bytes(key_data[0x82], 'big'),
-+ int.from_bytes(key_data[0x81], 'big')
- ).public_key(default_backend())
- elif algorithm in [ALGO.ECCP256, ALGO.ECCP384]:
- curve = ec.SECP256R1 if algorithm == ALGO.ECCP256 else
ec.SECP384R1
-@@ -832,7 +832,7 @@ class PivController(object):
- x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, common_name),
]))
-
- # x509.random_serial_number added in cryptography 1.6
-- serial = int_from_bytes(os.urandom(20), 'big') >> 1
-+ serial = int.from_bytes(os.urandom(20), 'big') >> 1
- builder = builder.serial_number(serial)
-
- builder = builder.not_valid_before(valid_from)
Index: security/yubico/yubikey-manager/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/security/yubico/yubikey-manager/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- security/yubico/yubikey-manager/pkg/PLIST 11 Mar 2022 19:54:10 -0000
1.3
+++ security/yubico/yubikey-manager/pkg/PLIST 29 May 2022 17:30:33 -0000
@@ -1,138 +1,89 @@
bin/ykman
lib/python${MODPY_VERSION}/site-packages/ykman/
-lib/python${MODPY_VERSION}/site-packages/ykman/VERSION
lib/python${MODPY_VERSION}/site-packages/ykman/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}descriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}driver.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}driver_ccid.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}driver_fido.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}driver_otp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}diagnostics.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}fido.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}logging_setup.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}oath.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}opgp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}openpgp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}otp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}piv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/base.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/
lib/python${MODPY_VERSION}/site-packages/ykman/cli/__init__.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}aliases.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}apdu.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}fido.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}mode.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}oath.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}opgp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}openpgp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}otp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}piv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/cli/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/cli/aliases.py
+lib/python${MODPY_VERSION}/site-packages/ykman/cli/apdu.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/config.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/fido.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/info.py
-lib/python${MODPY_VERSION}/site-packages/ykman/cli/mode.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/oath.py
-lib/python${MODPY_VERSION}/site-packages/ykman/cli/opgp.py
+lib/python${MODPY_VERSION}/site-packages/ykman/cli/openpgp.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/otp.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/piv.py
lib/python${MODPY_VERSION}/site-packages/ykman/cli/util.py
-lib/python${MODPY_VERSION}/site-packages/ykman/descriptor.py
lib/python${MODPY_VERSION}/site-packages/ykman/device.py
-lib/python${MODPY_VERSION}/site-packages/ykman/driver.py
-lib/python${MODPY_VERSION}/site-packages/ykman/driver_ccid.py
-lib/python${MODPY_VERSION}/site-packages/ykman/driver_fido.py
-lib/python${MODPY_VERSION}/site-packages/ykman/driver_otp.py
+lib/python${MODPY_VERSION}/site-packages/ykman/diagnostics.py
lib/python${MODPY_VERSION}/site-packages/ykman/fido.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}_tpm.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}attestation.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}cbor.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}cose.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}ctap.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}ctap1.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}ctap2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}hid.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}nfc.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}pcsc.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}rpid.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}webauthn.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/${MODPY_PYCACHE}win_api.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}hidtransport.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}openbsd.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/base.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/freebsd.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/hidtransport.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/linux.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/macos.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/openbsd.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_pyu2f/windows.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/_tpm.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/attestation.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/cbor.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/client.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/cose.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/ctap.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/ctap1.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/ctap2.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/extensions.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/hid.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/nfc.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/pcsc.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/rpid.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/server.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/utils.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/webauthn.py
-lib/python${MODPY_VERSION}/site-packages/ykman/fido2/win_api.py
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/hid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/base.py
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/linux.py
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/macos.py
+lib/python${MODPY_VERSION}/site-packages/ykman/hid/windows.py
lib/python${MODPY_VERSION}/site-packages/ykman/logging_setup.py
-lib/python${MODPY_VERSION}/site-packages/ykman/native/
-lib/python${MODPY_VERSION}/site-packages/ykman/native/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/native/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/ykman/native/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/native/${MODPY_PYCACHE}libloader.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/native/${MODPY_PYCACHE}pyusb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/native/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/native/${MODPY_PYCACHE}ykpers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ykman/native/libloader.py
-lib/python${MODPY_VERSION}/site-packages/ykman/native/pyusb.py
-lib/python${MODPY_VERSION}/site-packages/ykman/native/util.py
-lib/python${MODPY_VERSION}/site-packages/ykman/native/ykpers.py
lib/python${MODPY_VERSION}/site-packages/ykman/oath.py
-lib/python${MODPY_VERSION}/site-packages/ykman/opgp.py
+lib/python${MODPY_VERSION}/site-packages/ykman/openpgp.py
lib/python${MODPY_VERSION}/site-packages/ykman/otp.py
+lib/python${MODPY_VERSION}/site-packages/ykman/pcsc/
+lib/python${MODPY_VERSION}/site-packages/ykman/pcsc/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/pcsc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ykman/pcsc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/piv.py
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}bepo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}de.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}fr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}it.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}modhex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}norman.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}uk.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/${MODPY_PYCACHE}us.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/bepo.py
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/de.py
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/fr.py
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/it.py
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/modhex.py
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/norman.py
+lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/uk.py
lib/python${MODPY_VERSION}/site-packages/ykman/scancodes/us.py
lib/python${MODPY_VERSION}/site-packages/ykman/settings.py
lib/python${MODPY_VERSION}/site-packages/ykman/util.py
@@ -143,4 +94,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yubikey_manager-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/yubikey_manager-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/yubikey_manager-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yubikit/
+lib/python${MODPY_VERSION}/site-packages/yubikit/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yubikit/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yubikit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/${MODPY_PYCACHE}management.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/${MODPY_PYCACHE}oath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/${MODPY_PYCACHE}piv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/${MODPY_PYCACHE}yubiotp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yubikit/core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/${MODPY_PYCACHE}fido.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/${MODPY_PYCACHE}otp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/${MODPY_PYCACHE}smartcard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/fido.py
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/otp.py
+lib/python${MODPY_VERSION}/site-packages/yubikit/core/smartcard.py
+lib/python${MODPY_VERSION}/site-packages/yubikit/management.py
+lib/python${MODPY_VERSION}/site-packages/yubikit/oath.py
+lib/python${MODPY_VERSION}/site-packages/yubikit/piv.py
+lib/python${MODPY_VERSION}/site-packages/yubikit/yubiotp.py
@man man/man1/ykman.1
