From 3dcbcd4fa5215577cdcc4e2c925e3fd79474d33c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 May 2021 18:20:58 +0200 Subject: gnu: python-bcrypt: Update to 3.2.0. * gnu/packages/python-crypto.scm (python-bcrypt): Update to 3.2.0. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 97fcd96c88..733a87cd2f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -113,13 +113,13 @@ with what is used by the Bitcoin network.") (define-public python-bcrypt (package (name "python-bcrypt") - (version "3.1.7") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "bcrypt" version)) (sha256 - (base32 "0hhywhxx301cxivgxrpslrangbfpccc8y83qbwn1f57cab3nj00b")))) + (base32 "0agvzdn7r7jx5y4scl5gjmrmr6njvizwmr9n7h1kmaahdrrc34sv")))) (build-system python-build-system) (native-inputs `(("python-pycparser" ,python-pycparser) -- cgit v1.3 From 81fa44f431d33bd75e56648477a806f6e7786786 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 23 Jun 2021 17:52:25 +0200 Subject: gnu: python2-roca-detect: Remove package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python2-roca-detect): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 733a87cd2f..278657c57a 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -857,44 +857,6 @@ of improving usability, security and speed.") @end itemize\n") (license license:bsd-3))) -(define-public python2-roca-detect - (package - (name "python2-roca-detect") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (pypi-uri "roca-detect" version)) - (sha256 - (base32 - "1di4akyw2lf5r8zfwvyhkilz8jv8g4b66rgaqwfabmjwma6gnw27")))) - (build-system python-build-system) - (native-inputs - ;; TODO: apk_parse_ph4, pyjks - `(("python2-dateutil" ,python2-dateutil) - ("python2-six" ,python2-six) - ("python2-cryptography" ,python2-cryptography) - ("python2-future" ,python2-future) - ("python2-coloredlogs" ,python2-coloredlogs) - ("python2-pgpdump" ,python2-pgpdump))) - (arguments - `(;; Basic testing routine is quite simple and works with Py3 - ;; but the rest of the code that processes the different - ;; key formats and extracts the modulus for inspection is - ;; not yet fully py3 ready. - #:python ,python-2)) - (home-page "https://github.com/crocs-muni/roca") - (synopsis "ROCA detection tool") - (description - "This tool is related to the paper entitled @i{Return of the -Coppersmith’s Attack: Practical Factorization of Widely Used RSA Moduli}. It -enables you to test public RSA keys for a presence of the described -vulnerability. Currently the tool supports the following key formats: X.509 -Certificate (DER encoded, PEM encoded), RSA PEM (encoded private key, public -key), SSH public key, ASC-encoded OpenPGP key, APK Android application, LDIFF -file, and more.") - (license license:gpl3))) - (define-public python-blurhash (package (name "python-blurhash") -- cgit v1.3 From 656a1b63918742b20d843559dea240beecfb2a78 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 29 Jun 2021 15:11:18 +0200 Subject: gnu: python2-pgpdump: Remove package. * gnu/packages/python-crypto.scm (python2-pgpdump): Remove variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-crypto.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 278657c57a..0134c8c427 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -826,37 +826,6 @@ of improving usability, security and speed.") (define-public python2-pynacl (package-with-python2 python-pynacl)) -(define-public python2-pgpdump - (package - (name "python2-pgpdump") - (version "1.5") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pgpdump" version)) - (sha256 - (base32 - "0s4nh8h7qsdj2yf29bspjs1zvxd4lcd11r6g11dp7fppgf2h0iqw")))) - (build-system python-build-system) - - ;; Currently fails to build with Python 3. - (arguments `(#:python ,python-2)) - - (home-page "https://github.com/toofishes/python-pgpdump") - (synopsis "Python library for parsing PGP packets") - (description - "Python-pgpdump is an OpenPGP packet parser based on -@uref{http://www.mew.org/~kazu/proj/pgpdump/, pgpdump}. It notably supports: - -@itemize -@item signature packets; -@item public key packets; -@item secret key packets; -@item trust, user ID, and user attribute packets; -@item ASCII-armor decoding and CRC check. -@end itemize\n") - (license license:bsd-3))) - (define-public python-blurhash (package (name "python-blurhash") -- cgit v1.3 From 08935e5fff2ad9b453aced96f3c7453004945175 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 13 Jul 2021 09:57:28 -0400 Subject: gnu: Add python-certauth. * gnu/packages/python-crypto.scm (python-certauth): New variable. --- gnu/packages/python-crypto.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 0134c8c427..d9102adcc9 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Justus Winter ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -468,6 +469,32 @@ general production use. Include this module and use its backends at your own risk.") (license license:expat))) +(define-public python-certauth + (package + (name "python-certauth") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "certauth" version)) + (sha256 + (base32 + "1yxqfb5131wahjyw9pxz03bq476rcfx62s6k53xx4cqbzzgdaqkq")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pyopenssl" ,python-pyopenssl) + ("python-tldextract" ,python-tldextract))) + (native-inputs + `(("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://github.com/ikreymer/certauth") + (synopsis "Certificate authority creation tool") + (description "This package provides a small library, built on top of +pyOpenSSL, which allows for creating a custom certificate authority (CA) +certificate, and generating on-demand dynamic host certs using that CA +certificate. It is most useful for use with a man-in-the-middle HTTPS proxy, +for example, for recording or replaying web content.") + (license license:expat))) + (define-public python-certifi (package (name "python-certifi") -- cgit v1.3 From de83a236b96f19467f2d7312f6365ae56099e740 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Wed, 4 Aug 2021 22:29:31 +1000 Subject: gnu: Remove python2-bcrypt. Remove unused dependency of previously removed fabric package. * gnu/packages/python-crypto.scm (python2-bcrypt): Remove variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index d9102adcc9..6176866aac 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -138,9 +138,6 @@ on the Blowfish password hashing algorithm, as described in Password Scheme\"} by Niels Provos and David Mazieres.") (license license:asl2.0))) -(define-public python2-bcrypt - (package-with-python2 python-bcrypt)) - (define-public python-passlib (package (name "python-passlib") -- cgit v1.3 From 1ee6166bd72c45466cad8f8b9b35b35baa425ae0 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Wed, 4 Aug 2021 22:29:32 +1000 Subject: gnu: Remove python2-pynacl. Remove unused dependency of previously removed fabric package. * gnu/packages/python-crypto.scm (python2-pynacl): Remove variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6176866aac..bc3d317ad7 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -847,9 +847,6 @@ Networking and Cryptography library. These libraries have a stated goal of improving usability, security and speed.") (license license:asl2.0))) -(define-public python2-pynacl - (package-with-python2 python-pynacl)) - (define-public python-blurhash (package (name "python-blurhash") -- cgit v1.3 From 28b6f9cadd8c8bda0301f963c6c360465443067d Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Wed, 4 Aug 2021 22:29:33 +1000 Subject: gnu: Remove python2-paramiko. Remove unused dependency of previously removed fabric package. * gnu/packages/python-crypto.scm (python2-paramiko): Remove variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bc3d317ad7..6c25e0dd36 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -257,9 +257,6 @@ extension for low level cryptography (PyCrypto), Paramiko itself is a pure Python interface around SSH networking concepts.") (license license:lgpl2.1+))) -(define-public python2-paramiko - (package-with-python2 python-paramiko)) - (define-public python-ecdsa (package (name "python-ecdsa") -- cgit v1.3 From 150cf64b04dcb370124e02a5bb347e0617bae20c Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 18 Aug 2021 00:43:16 +0200 Subject: gnu: python-pycryptodome: Unbundle libtomcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (pycryptodome-unbundle-tomcrypt-snippet): New variable. (python-pycryptodome)[source]{snippet}: Unbundle libtomcrypt. (python-pycryptodome)[source]{modules}: Add (guix build utils). Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6c25e0dd36..6d50ae682f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Justus Winter ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,6 +45,7 @@ (define-module (gnu packages python-crypto) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -938,6 +940,22 @@ protocol (Javascript Object Signing and Encryption).") (define-public python2-josepy (package-with-python2 python-josepy)) +(define pycryptodome-unbundle-tomcrypt-snippet + #~(begin + ;; Unbundle libtomcrypt. + (delete-file-recursively "src/libtom") + (substitute* "src/DES.c" + (("#include \"libtom/tomcrypt_des.c\"") + "#include ")) + (substitute* "setup.py" + (("include_dirs=\\['src/', 'src/libtom/'\\]") + ;; FIXME: why does '-ltomcrypt' need to be added + ;; manually, even when 'tomcrypt' is added to 'libraries'? + ;; This behaviour is not documented at + ;; . + "include_dirs=['src/'], libraries=['tomcrypt', 'tommath'], + extra_link_args=['-ltomcrypt', '-ltommath']")))) + (define-public python-pycryptodome (package (name "python-pycryptodome") @@ -948,8 +966,13 @@ protocol (Javascript Object Signing and Encryption).") (uri (pypi-uri "pycryptodome" version)) (sha256 (base32 - "1i4m74f88qj9ci8rpyzrbk2slmsdj5ipmwdkq6qk24byalm203li")))) + "1i4m74f88qj9ci8rpyzrbk2slmsdj5ipmwdkq6qk24byalm203li")) + (modules '((guix build utils))) + (snippet pycryptodome-unbundle-tomcrypt-snippet))) (build-system python-build-system) + (inputs + `(("libtomcrypt" ,libtomcrypt) + ("libtommath" ,libtommath))) (home-page "https://www.pycryptodome.org") (synopsis "Low-level cryptographic Python library") (description -- cgit v1.3 From 0e05bee4bed6c2a2df72296c15f6726c24e2bdc7 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 18 Aug 2021 12:46:51 +0200 Subject: gnu: python-pycryptodomex: Unbundle libtomcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python-pycryptodomex)[source]{snippet}: Unbundle libtomcrypt. (python-pycryptodomex)[source]{modules}: Add (guix build utils). Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6d50ae682f..cec57f9fda 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1025,7 +1025,9 @@ PyCryptodome variants, the other being python-pycryptodomex.") (method url-fetch) (uri (pypi-uri "pycryptodomex" version)) (sha256 - (base32 "0lbx4qk3xmwqiidhmkj8qa7bh2lf8bwzg0xjpsh2w5zqjrc7qnvv")))) + (base32 "0lbx4qk3xmwqiidhmkj8qa7bh2lf8bwzg0xjpsh2w5zqjrc7qnvv")) + (modules '((guix build utils))) + (snippet pycryptodome-unbundle-tomcrypt-snippet))) (description "PyCryptodome is a self-contained Python package of low-level cryptographic primitives. It's not a wrapper to a separate C library like -- cgit v1.3 From fee1a41f9572de5c04d46e6c8e03a442d7f10d4c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 17 Sep 2021 17:55:32 +0000 Subject: gnu: Remove python2-passlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python2-passlib): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index cec57f9fda..cbf563af42 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Justus Winter -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; @@ -171,9 +171,6 @@ useful for a wide range of tasks, from verifying a hash found in /etc/shadow, to providing full-strength password hashing for multi-user application.") (license license:bsd-3))) -(define-public python2-passlib - (package-with-python2 python-passlib)) - (define-public python-py-bcrypt (package (name "python-py-bcrypt") -- cgit v1.3 From 6d6b3a0c3ceeead480cfab398dd7515252e5a22a Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 17 Sep 2021 17:55:33 +0000 Subject: gnu: python-passlib: Use python-bcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit py-bcrypt is unmaintained and support will be dropped in passlib 1.8. The recommended option is bcrypt. * gnu/packages/python-crypto.scm (python-passlib)[propagated-inputs]: Remove python-py-bcrypt. Add python-bcrypt. [arguments]<#:phases>: Don't return #t. Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index cbf563af42..bfc97e53b3 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -154,13 +154,13 @@ Password Scheme\"} by Niels Provos and David Mazieres.") (native-inputs `(("python-nose" ,python-nose))) (propagated-inputs - `(("python-py-bcrypt" ,python-py-bcrypt))) + `(("python-bcrypt" ,python-bcrypt))) (arguments `(#:phases (modify-phases %standard-phases (add-before 'check 'set-PYTHON_EGG_CACHE ;; Some tests require access to "$HOME/.cython". - (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) + (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp")))))) (home-page "https://bitbucket.org/ecollins/passlib") (synopsis "Comprehensive password hashing framework") (description -- cgit v1.3 From e29c3e1856b8d05cf98d652207df981ae7197d3a Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 17 Sep 2021 17:55:34 +0000 Subject: gnu: Remove python-py-bcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python-py-bcrypt, python2-py-bcrypt): Remove variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bfc97e53b3..1cddc56f1b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -171,38 +171,6 @@ useful for a wide range of tasks, from verifying a hash found in /etc/shadow, to providing full-strength password hashing for multi-user application.") (license license:bsd-3))) -(define-public python-py-bcrypt - (package - (name "python-py-bcrypt") - (version "0.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "py-bcrypt" version)) - (sha256 - (base32 - "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az")))) - (build-system python-build-system) - (home-page "https://code.google.com/p/py-bcrypt") - (synopsis - "Bcrypt password hashing and key derivation") - (description - "A python wrapper of OpenBSD's Blowfish password hashing code. This -system hashes passwords using a version of Bruce Schneier's Blowfish block -cipher with modifications designed to raise the cost of off-line password -cracking and frustrate fast hardware implementation. The computation cost of -the algorithm is parametrised, so it can be increased as computers get faster. -The intent is to make a compromise of a password database less likely to -result in an attacker gaining knowledge of the plaintext passwords (e.g. using -John the Ripper).") - ;; "sha2.c" is under BSD-3; - ;; "blowfish.c" and "bcrypt.c" are under BSD-4; - ;; the rest is under ISC. - (license (list license:isc license:bsd-3 license:bsd-4)))) - -(define-public python2-py-bcrypt - (package-with-python2 python-py-bcrypt)) - (define-public python-pyblake2 (package (name "python-pyblake2") -- cgit v1.3