py-hsm: updated to 1.2.1

Version 1.2.1:
* Fixup release: Remove minimum version for sqlalchemy dependency which was
    set too high.
* yhsm-yubikey-ksm: Add --proxy/--proxies argument for logging proxies
    requests.

Version 1.2.0:
* yhsm-validation-server: Support OATH TOTP.
* yhsm-init-oath-token: Handle keys with length != 20.
* yhsm-yubikey-ksm: Allow passing soft-HSM keys via stdin by passing "-" as
    device argument.
* yhsm-yubikey-ksm: Allow passing --db-url via environment variable.
* Moved utils, yubikey-ksm and validation-server to be included when
    installing using pip.
* Use entry_point scripts generated by setuptools.
* Moved man pages to man/ directory.
* Bugfix: Fix AEAD generation on Windows by writing in binary mode.
* Bugfix: Support AEADs generated on Windows using pyhsm <= 1.1.1.
* Bugfix: Avoid installing unit test package.
* Bugfix: yhsm-import-keys: Fix --aes-key argument used when importing
    without a YubiHSM.

Version 1.1.1:
* Fixup release.

Version 1.1.0:
* Restructured the repository and build process.
* Use Semantic Versioning (semver.org).
* Added support for a "soft" HSM in yhsm-yubikey-ksm, yhsm-import-keys
    and yhsm-generate-keys.

Version 1.0.4l:
* Documentation is now in asciidoc format.
* yhsm-yubikey-ksm: Fix bug when the same public ID occured for multiple
    keyhandles.

4 files changed, 91 insertions, 18 deletions

diff --git a/security/py-hsm/Makefile b/security/py-hsm/Makefile
index 2457ed19294..16ae00fcdfc 100644
--- a/security/py-hsm/Makefile
+++ b/security/py-hsm/Makefile
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2014/09/27 20:22:01 pettai Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/20 17:13:26 adam Exp $
 
-DISTNAME=	pyhsm-1.0.4k
+DISTNAME=	pyhsm-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-CATEGORIES=	security
-MASTER_SITES=	http://opensource.yubico.com/python-pyhsm/releases/
+CATEGORIES=	security python
+MASTER_SITES=	https://developers.yubico.com/python-pyhsm/Releases/
 
 MAINTAINER=	pettai@NetBSD.org
-HOMEPAGE=	http://opensource.yubico.com/python-pyhsm/
+HOMEPAGE=	https://developers.yubico.com/python-pyhsm/
 COMMENT=	Python package that talk to a YubiHSM
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
-DEPENDS+=	${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
-
-PYDISTUTILSPKG= yes
-
-PYSETUP=                setup.py
+DEPENDS+=	${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
+DEPENDS+=	${PYPKGPREFIX}-serial>=2.3:../../comms/py-serial
 
 USE_LANGUAGES=	# none
 
-CONFLICTS+=	${PYPKGPREFIX}-pyhsm-[0-9]*
+PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-hsm/PLIST b/security/py-hsm/PLIST
index 7741fce4f3b..d9e23a72806 100644
--- a/security/py-hsm/PLIST
+++ b/security/py-hsm/PLIST
@@ -1,7 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2013/10/08 15:21:37 pettai Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/09/20 17:13:26 adam Exp $
+bin/yhsm-daemon
+bin/yhsm-db-export
+bin/yhsm-db-import
+bin/yhsm-decrypt-aead
+bin/yhsm-generate-keys
+bin/yhsm-import-keys
+bin/yhsm-init-oath-token
+bin/yhsm-keystore-unlock
+bin/yhsm-linux-add-entropy
+bin/yhsm-validate-otp
+bin/yhsm-validation-server
+bin/yhsm-yubikey-ksm
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pyhsm/__init__.py
@@ -40,9 +53,27 @@ ${PYSITELIB}/pyhsm/exception.pyo
 ${PYSITELIB}/pyhsm/hmac_cmd.py
 ${PYSITELIB}/pyhsm/hmac_cmd.pyc
 ${PYSITELIB}/pyhsm/hmac_cmd.pyo
+${PYSITELIB}/pyhsm/ksm/__init__.py
+${PYSITELIB}/pyhsm/ksm/__init__.pyc
+${PYSITELIB}/pyhsm/ksm/__init__.pyo
+${PYSITELIB}/pyhsm/ksm/db_export.py
+${PYSITELIB}/pyhsm/ksm/db_export.pyc
+${PYSITELIB}/pyhsm/ksm/db_export.pyo
+${PYSITELIB}/pyhsm/ksm/db_import.py
+${PYSITELIB}/pyhsm/ksm/db_import.pyc
+${PYSITELIB}/pyhsm/ksm/db_import.pyo
+${PYSITELIB}/pyhsm/ksm/import_keys.py
+${PYSITELIB}/pyhsm/ksm/import_keys.pyc
+${PYSITELIB}/pyhsm/ksm/import_keys.pyo
+${PYSITELIB}/pyhsm/ksm/yubikey_ksm.py
+${PYSITELIB}/pyhsm/ksm/yubikey_ksm.pyc
+${PYSITELIB}/pyhsm/ksm/yubikey_ksm.pyo
 ${PYSITELIB}/pyhsm/oath_hotp.py
 ${PYSITELIB}/pyhsm/oath_hotp.pyc
 ${PYSITELIB}/pyhsm/oath_hotp.pyo
+${PYSITELIB}/pyhsm/oath_totp.py
+${PYSITELIB}/pyhsm/oath_totp.pyc
+${PYSITELIB}/pyhsm/oath_totp.pyo
 ${PYSITELIB}/pyhsm/soft_hsm.py
 ${PYSITELIB}/pyhsm/soft_hsm.pyc
 ${PYSITELIB}/pyhsm/soft_hsm.pyo
@@ -52,9 +83,39 @@ ${PYSITELIB}/pyhsm/stick.pyo
 ${PYSITELIB}/pyhsm/stick_client.py
 ${PYSITELIB}/pyhsm/stick_client.pyc
 ${PYSITELIB}/pyhsm/stick_client.pyo
+${PYSITELIB}/pyhsm/stick_daemon.py
+${PYSITELIB}/pyhsm/stick_daemon.pyc
+${PYSITELIB}/pyhsm/stick_daemon.pyo
+${PYSITELIB}/pyhsm/tools/__init__.py
+${PYSITELIB}/pyhsm/tools/__init__.pyc
+${PYSITELIB}/pyhsm/tools/__init__.pyo
+${PYSITELIB}/pyhsm/tools/decrypt_aead.py
+${PYSITELIB}/pyhsm/tools/decrypt_aead.pyc
+${PYSITELIB}/pyhsm/tools/decrypt_aead.pyo
+${PYSITELIB}/pyhsm/tools/generate_keys.py
+${PYSITELIB}/pyhsm/tools/generate_keys.pyc
+${PYSITELIB}/pyhsm/tools/generate_keys.pyo
+${PYSITELIB}/pyhsm/tools/keystore_unlock.py
+${PYSITELIB}/pyhsm/tools/keystore_unlock.pyc
+${PYSITELIB}/pyhsm/tools/keystore_unlock.pyo
+${PYSITELIB}/pyhsm/tools/linux_add_entropy.py
+${PYSITELIB}/pyhsm/tools/linux_add_entropy.pyc
+${PYSITELIB}/pyhsm/tools/linux_add_entropy.pyo
 ${PYSITELIB}/pyhsm/util.py
 ${PYSITELIB}/pyhsm/util.pyc
 ${PYSITELIB}/pyhsm/util.pyo
+${PYSITELIB}/pyhsm/val/__init__.py
+${PYSITELIB}/pyhsm/val/__init__.pyc
+${PYSITELIB}/pyhsm/val/__init__.pyo
+${PYSITELIB}/pyhsm/val/init_oath_token.py
+${PYSITELIB}/pyhsm/val/init_oath_token.pyc
+${PYSITELIB}/pyhsm/val/init_oath_token.pyo
+${PYSITELIB}/pyhsm/val/validate_otp.py
+${PYSITELIB}/pyhsm/val/validate_otp.pyc
+${PYSITELIB}/pyhsm/val/validate_otp.pyo
+${PYSITELIB}/pyhsm/val/validation_server.py
+${PYSITELIB}/pyhsm/val/validation_server.pyc
+${PYSITELIB}/pyhsm/val/validation_server.pyo
 ${PYSITELIB}/pyhsm/validate_cmd.py
 ${PYSITELIB}/pyhsm/validate_cmd.pyc
 ${PYSITELIB}/pyhsm/validate_cmd.pyo
diff --git a/security/py-hsm/distinfo b/security/py-hsm/distinfo
index dbcbb524593..de07de5af48 100644
--- a/security/py-hsm/distinfo
+++ b/security/py-hsm/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:18:04 agc Exp $
+$NetBSD: distinfo,v 1.5 2019/09/20 17:13:26 adam Exp $
 
-SHA1 (pyhsm-1.0.4k.tar.gz) = ccfee42a4b952390f7fe9ccd6c40f8d4d2749241
-RMD160 (pyhsm-1.0.4k.tar.gz) = 4c7229de4b7dd2e048eb98e485195b4eed5089c7
-SHA512 (pyhsm-1.0.4k.tar.gz) = 3952ce4fd0eb11e2766745893c6fb0aca71eab3e6fcf026c3cac37e2a1c98ff166a9ba1d7c8ccb1af495ae4158d83cb989826ddc9ee0ac9c14459b29972b2c4a
-Size (pyhsm-1.0.4k.tar.gz) = 158900 bytes
+SHA1 (pyhsm-1.2.1.tar.gz) = d9236ef6d2cdc52e7f798ce38cfbbab85a57f016
+RMD160 (pyhsm-1.2.1.tar.gz) = 2f80edf92de99f4a64ae786516ffe120960a17a1
+SHA512 (pyhsm-1.2.1.tar.gz) = 4ae7e627a1f62fc4412dc62572a7f7550f3cc9bf75a3cf1d92b2f9aa31bc98041474d1c574ddc2dd1a97f3419c6a3bae4a265039605ddd33d4f616728a2735d5
+Size (pyhsm-1.2.1.tar.gz) = 100911 bytes
+SHA1 (patch-setup.py) = 8c826bf9cd210ad8492a8184158af854faab680e
diff --git a/security/py-hsm/patches/patch-setup.py b/security/py-hsm/patches/patch-setup.py
new file mode 100644
index 00000000000..7e2f2b25eba
--- /dev/null
+++ b/security/py-hsm/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2019/09/20 17:13:26 adam Exp $
+
+Prefer py-cryptodome.
+
+--- setup.py.orig	2019-09-20 17:03:05.000000000 +0000
++++ setup.py
+@@ -71,7 +71,7 @@ setup(
+     tests_require=[],
+     install_requires=[
+         'pyserial >= 2.3',
+-        'pycrypto >= 2.1'
++        'pycryptodome'
+     ],
+     extras_require={
+         'db': ['sqlalchemy'],