diff --git a/_service b/_service index 540794c..ae827a5 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ tpm2-pytss - 2.2.0 + 2.3.0 git disable https://github.com/tpm2-software/tpm2-pytss.git diff --git a/_servicedata b/_servicedata index 5dc308c..199d509 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/tpm2-software/tpm2-pytss.git - b9dae8373baad0f9f09a8d745a063f4960dd9369 \ No newline at end of file + 930cee2c45b84ac533c320b883b226edaeda9a38 \ No newline at end of file diff --git a/python-tpm2-pytss-RSAPrivateNumbers.patch b/python-tpm2-pytss-RSAPrivateNumbers.patch deleted file mode 100644 index a1b5a2a..0000000 --- a/python-tpm2-pytss-RSAPrivateNumbers.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: tpm2-pytss-2.2.0/src/tpm2_pytss/internal/crypto.py -=================================================================== ---- tpm2-pytss-2.2.0.orig/src/tpm2_pytss/internal/crypto.py -+++ tpm2-pytss-2.2.0/src/tpm2_pytss/internal/crypto.py -@@ -23,7 +23,7 @@ from cryptography.hazmat.primitives.ciph - from cryptography.hazmat.primitives.ciphers import modes, Cipher, CipherAlgorithm - from cryptography.hazmat.backends import default_backend - from cryptography.exceptions import UnsupportedAlgorithm, InvalidSignature --from typing import Tuple, Type -+from typing import Tuple, Type, Any - import secrets - import sys - -@@ -220,7 +220,7 @@ def public_to_key(obj): - return key - - --class _MyRSAPrivateNumbers(rsa.RSAPrivateNumbers): -+class _MyRSAPrivateNumbers: - def __init__(self, p: int, n: int, e: int, pubnums: rsa.RSAPublicNumbers): - - q = n // p -@@ -231,7 +231,12 @@ class _MyRSAPrivateNumbers(rsa.RSAPrivat - dmq1 = rsa.rsa_crt_dmq1(d, q) - iqmp = rsa.rsa_crt_iqmp(p, q) - -- super().__init__(p, q, d, dmp1, dmq1, iqmp, pubnums) -+ self._private_numbers = rsa.RSAPrivateNumbers( -+ p, q, d, dmp1, dmq1, iqmp, pubnums -+ ) -+ -+ def private_key(self, *args: Any, **kwargs: Any) -> rsa.RSAPrivateKey: -+ return self._private_numbers.private_key(*args, **kwargs) - - @staticmethod - def _xgcd(a: int, b: int) -> Tuple[int, int, int]: -@@ -251,15 +256,7 @@ class _MyRSAPrivateNumbers(rsa.RSAPrivat - # - @staticmethod - def _modinv(a, m): -- -- if sys.version_info < (3, 8): -- g, x, y = _MyRSAPrivateNumbers._xgcd(a, m) -- if g != 1: -- raise Exception("modular inverse does not exist") -- else: -- return x % m -- else: -- return pow(a, -1, m) -+ return pow(a, -1, m) - - @staticmethod - def _generate_d(p, q, e, n): diff --git a/python-tpm2-pytss.changes b/python-tpm2-pytss.changes index 980554c..ef5f84d 100644 --- a/python-tpm2-pytss.changes +++ b/python-tpm2-pytss.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Oct 9 04:00:45 UTC 2024 - Steve Kowalik + +- Update to version 2.3.0: + * FAPI: support exists_ok for create_nv + * Compatibility with python-cryptography 42 + * scripts: update regex for #defines + * cryptography: fixes for newer version of cryptography + * docs/maintainers: add gpg key details + * docs: fix whitespace error + * docs: fix error on SECURITY.md not being used + * cryptography: add module for using TPM keys with the cryptography module + * encoding: add deprecation warning to tools_encdec + * internal/crypto: fix _MyRSAPrivateNumbers with cryptograpy >= 42.0.1 + * test: disable pcr_set_auth_value and pcr_set_auth_policy tests for swtpm +- Drop patch python-tpm2-pytss-RSAPrivateNumbers.patch, included upstream. +- Switch to pyproject macros. + ------------------------------------------------------------------- Wed Feb 28 10:44:28 UTC 2024 - Pedro Monreal diff --git a/python-tpm2-pytss.spec b/python-tpm2-pytss.spec index 43e938f..d6ea41c 100644 --- a/python-tpm2-pytss.spec +++ b/python-tpm2-pytss.spec @@ -17,28 +17,27 @@ %define pythons python3 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define srcname tpm2-pytss %bcond_with test Name: python-%{srcname} -Version: 2.2.0 +Version: 2.3.0 Release: 0 Summary: Python bindings for TSS License: BSD-2-Clause URL: https://github.com/tpm2-software/tpm2-pytss Source: %{srcname}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Fix tpm2-pkcs11 build: github.com/tpm2-software/tpm2-pytss/pull/562 -Patch0: python-tpm2-pytss-RSAPrivateNumbers.patch BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module asn1crypto} BuildRequires: %{python_module cffi} BuildRequires: %{python_module cryptography} BuildRequires: %{python_module devel} BuildRequires: %{python_module packaging} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pkgconfig} BuildRequires: %{python_module pycparser} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros @@ -49,7 +48,6 @@ Requires: python3-asn1crypto Requires: python3-cffi Requires: python3-cryptography Requires: python3-packaging -Requires: python3-setuptools Requires: pkgconfig(tss2-esys) Requires: pkgconfig(tss2-fapi) %if %{with test} @@ -81,10 +79,10 @@ Metadata-Version: 1.1 Version: %{version} EOF export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %if %{with test} @@ -95,6 +93,6 @@ export CFLAGS="%{optflags}" %files %{python_files} %license LICENSE %{python_sitearch}/tpm2_pytss -%{python_sitearch}/tpm2_pytss-%{version}*-info +%{python_sitearch}/tpm2_pytss-%{version}.dist-info %changelog diff --git a/tpm2-pytss-2.2.0.tar.gz b/tpm2-pytss-2.2.0.tar.gz deleted file mode 100644 index 7a10ac0..0000000 --- a/tpm2-pytss-2.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68e1caf6fc81fc93392bc917a72a48bb149bf03acf1c3408ed3a8433095d94d2 -size 210068 diff --git a/tpm2-pytss-2.3.0.tar.gz b/tpm2-pytss-2.3.0.tar.gz new file mode 100644 index 0000000..fb8677d --- /dev/null +++ b/tpm2-pytss-2.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57c9e04cb600f2ba07f01a355e33d8b8d2d1119f116e28d5ab20924aee9db1dc +size 216441