* [gentoo-commits] repo/gentoo:master commit in: dev-python/tpm2-pytss/files/, dev-python/tpm2-pytss/
@ 2022-09-05 13:07 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2022-09-05 13:07 UTC (permalink / raw
To: gentoo-commits
commit: e41d92db9149d645121105d336411bec4c096fb3
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 22:13:42 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 13:07:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41d92db
dev-python/tpm2-pytss: drop 1.1.0
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26953
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-python/tpm2-pytss/Manifest | 1 -
....1.0-src-move-package-under-src-directory.patch | 239 ---------------------
dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild | 41 ----
3 files changed, 281 deletions(-)
diff --git a/dev-python/tpm2-pytss/Manifest b/dev-python/tpm2-pytss/Manifest
index 4f8086d66abe..3a37429b445d 100644
--- a/dev-python/tpm2-pytss/Manifest
+++ b/dev-python/tpm2-pytss/Manifest
@@ -1,2 +1 @@
-DIST tpm2-pytss-1.1.0.tar.gz 162559 BLAKE2B 2c9b34c323b96b3a8ded82a04accac9647d7f0b1cf05d269ed4bdf225d785fd8454dee82f054a5085f9d49d0feabacc8c5b72a7ee8af7bc9da8473d5689501b5 SHA512 71da9e005a3f645c0528a96bb96bafde9c262c5778646a19841af6323edaf889ede7267317ea96b7d44c7901d7bea04ca15fd1b5c86d61d33e49b34f5d0e2e94
DIST tpm2-pytss-1.2.0.tar.gz 178555 BLAKE2B 782f7d8194d2a9395213f39e5a17414ae2ab49f961b01c496fd54803a43f6846434a1d69a3993d16b6b51c2578f6f5e1a0d883be791cf6fb29ae23012b2090cf SHA512 688223d05a2ed5f3a5aeec47c77a02c10d40d4f23a97622e76acbf8f86b14ac2a92482869c5e04de395edb96b1e1b142c5ff53c7dbc97673ead531e4d6138184
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch
deleted file mode 100644
index 6e6342cac5b6..000000000000
--- a/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From a03b66dd73a2ff58ebf847864102585aa3d11af7 Mon Sep 17 00:00:00 2001
-From: William Roberts <william.c.roberts@intel.com>
-Date: Wed, 11 May 2022 17:07:53 -0500
-Subject: [PATCH] src: move package under src directory
-
-Issue #341 reports that building a wheel and running the tests fails. I
-was able to reproduce this behavior with the following commands:
-
-python3 -Bm build -w --no-isolation
-python3 -m installer --destdir=installation dist/*.whl
-export PYTHONPATH="/home/wcrobert/tmp/installation/usr/lib/python3.8/site-packages"
-pytest test/test_types.py
-
-Note:
- - Current Working Directory is the repo clone, so tpm2-pytss
- - The export command may need to be updated for your specific version
- of python.
-
-It fails with:
-ImportError while importing test module '/home/wcrobert/workspace/tpm2-pytss/test/test_types.py'.
-<snip>
-E ModuleNotFoundError: No module named 'tpm2_pytss._libtpm2_pytss'
-
-However, this issue is a red herring. This really has to do with the
-fact that the relative import in the test code tries to resolve to
-non-built package in that directory rather then the built one on
-PYTHONPATH.
-
-Proposed solutions to use full package names also don't work, becuase it
-has to resolve to the built package and it will still attempt to resolve
-the non-built package. The least finicky solution to fix this, was to
-match what bcrypt was doing and move it under a src directory so it
-forces the resolution to not occur on that directory and inplace (pip
-install -e .) installations still work as well.
-
-Fixes: #341
-
-Signed-off-by: William Roberts <william.c.roberts@intel.com>
----
- .gitignore | 4 ++--
- MANIFEST.in | 8 ++++----
- scripts/prepare_headers.py | 2 +-
- setup.cfg | 6 ++++--
- setup.py | 8 +++++---
- {tpm2_pytss => src/tpm2_pytss}/ESAPI.py | 0
- {tpm2_pytss => src/tpm2_pytss}/FAPI.py | 0
- {tpm2_pytss => src/tpm2_pytss}/TCTI.py | 0
- {tpm2_pytss => src/tpm2_pytss}/TCTILdr.py | 0
- {tpm2_pytss => src/tpm2_pytss}/TSS2_Exception.py | 0
- {tpm2_pytss => src/tpm2_pytss}/__init__.py | 0
- {tpm2_pytss => src/tpm2_pytss}/callbacks.py | 0
- {tpm2_pytss => src/tpm2_pytss}/constants.py | 0
- {tpm2_pytss => src/tpm2_pytss}/encoding.py | 0
- {tpm2_pytss => src/tpm2_pytss}/fapi_info.py | 0
- src/tpm2_pytss/internal/__init__.py | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/constants.py | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/crypto.py | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/templates.py | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/utils.py | 0
- {tpm2_pytss => src/tpm2_pytss}/tsskey.py | 0
- {tpm2_pytss => src/tpm2_pytss}/types.py | 0
- {tpm2_pytss => src/tpm2_pytss}/utils.py | 0
- 23 files changed, 16 insertions(+), 12 deletions(-)
- rename {tpm2_pytss => src/tpm2_pytss}/ESAPI.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/FAPI.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/TCTI.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/TCTILdr.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/TSS2_Exception.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/__init__.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/callbacks.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/constants.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/encoding.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/fapi_info.py (100%)
- create mode 100644 src/tpm2_pytss/internal/__init__.py
- rename {tpm2_pytss => src/tpm2_pytss}/internal/constants.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/internal/crypto.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/internal/templates.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/internal/utils.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/tsskey.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/types.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/utils.py (100%)
-
-diff --git a/.gitignore b/.gitignore
-index 07e277e..396cfdb 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -40,5 +40,5 @@ public/
- *.rej
- htmlcov
- /.pytest_cache/
--tpm2_pytss/internal/type_mapping.py
--tpm2_pytss/internal/versions.py
-+src/tpm2_pytss/internal/type_mapping.py
-+src/tpm2_pytss/internal/versions.py
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 6bc43ab..7bbc96a 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -1,8 +1,8 @@
- include README.md
- include LICENSE
--include tpm2_pytss/version
--include tpm2_pytss/config.json
--recursive-include tpm2_pytss/swig *
-+include src/tpm2_pytss/version
-+include src/tpm2_pytss/config.json
-+recursive-include src/tpm2_pytss/swig *
- recursive-include tests *
- recursive-include examples *
--exclude tpm2_pytss/internal/type_mapping.py
-+exclude src/tpm2_pytss/internal/type_mapping.py
-diff --git a/scripts/prepare_headers.py b/scripts/prepare_headers.py
-index 0864a3d..7eb0a57 100644
---- a/scripts/prepare_headers.py
-+++ b/scripts/prepare_headers.py
-@@ -11,7 +11,7 @@ import textwrap
-
- # import tpm2_pytss.constants
- constants_spec = importlib.util.spec_from_file_location(
-- "tpm2_pytss.internal.constants", "tpm2_pytss/internal/constants.py"
-+ "tpm2_pytss.internal.constants", "src/tpm2_pytss/internal/constants.py"
- )
- constants = importlib.util.module_from_spec(constants_spec)
- constants_spec.loader.exec_module(constants)
-diff --git a/setup.cfg b/setup.cfg
-index 89a3c7a..5426a07 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -18,9 +18,11 @@ classifiers =
- Programming Language :: Python :: 3.10
-
- [options]
--packages =
-+package_dir=
-+ =src
-+packages=
- tpm2_pytss
-- tpm2_pytss/internal
-+ tpm2_pytss.internal
- setup_requires =
- setuptools_scm[toml]>=3.4.3
- cffi>=1.0.0
-diff --git a/setup.py b/setup.py
-index f10fe73..b7f1c96 100644
---- a/setup.py
-+++ b/setup.py
-@@ -200,13 +200,15 @@ class type_generator(build_ext):
-
- p = os.path.join(self.build_lib, "tpm2_pytss/internal/type_mapping.py")
- sp = os.path.join(
-- os.path.dirname(__file__), "tpm2_pytss/internal/type_mapping.py"
-+ os.path.dirname(__file__), "src/tpm2_pytss/internal/type_mapping.py"
- )
-
- vp = os.path.join(self.build_lib, "tpm2_pytss/internal/versions.py")
-- svp = os.path.join(os.path.dirname(__file__), "tpm2_pytss/internal/versions.py")
-+ svp = os.path.join(
-+ os.path.dirname(__file__), "src/tpm2_pytss/internal/versions.py"
-+ )
-
-- print(f"generated _type_map with {len(type_map)} mappings")
-+ print(f"generated _type_map with {len(type_map)} mappings in {p} and {sp}")
- print(f"generated _element_type_map with {len(element_type_map)} mappings")
- print(f"generated _versions with {len(versions)} versions")
-
-diff --git a/tpm2_pytss/ESAPI.py b/src/tpm2_pytss/ESAPI.py
-similarity index 100%
-rename from tpm2_pytss/ESAPI.py
-rename to src/tpm2_pytss/ESAPI.py
-diff --git a/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py
-similarity index 100%
-rename from tpm2_pytss/FAPI.py
-rename to src/tpm2_pytss/FAPI.py
-diff --git a/tpm2_pytss/TCTI.py b/src/tpm2_pytss/TCTI.py
-similarity index 100%
-rename from tpm2_pytss/TCTI.py
-rename to src/tpm2_pytss/TCTI.py
-diff --git a/tpm2_pytss/TCTILdr.py b/src/tpm2_pytss/TCTILdr.py
-similarity index 100%
-rename from tpm2_pytss/TCTILdr.py
-rename to src/tpm2_pytss/TCTILdr.py
-diff --git a/tpm2_pytss/TSS2_Exception.py b/src/tpm2_pytss/TSS2_Exception.py
-similarity index 100%
-rename from tpm2_pytss/TSS2_Exception.py
-rename to src/tpm2_pytss/TSS2_Exception.py
-diff --git a/tpm2_pytss/__init__.py b/src/tpm2_pytss/__init__.py
-similarity index 100%
-rename from tpm2_pytss/__init__.py
-rename to src/tpm2_pytss/__init__.py
-diff --git a/tpm2_pytss/callbacks.py b/src/tpm2_pytss/callbacks.py
-similarity index 100%
-rename from tpm2_pytss/callbacks.py
-rename to src/tpm2_pytss/callbacks.py
-diff --git a/tpm2_pytss/constants.py b/src/tpm2_pytss/constants.py
-similarity index 100%
-rename from tpm2_pytss/constants.py
-rename to src/tpm2_pytss/constants.py
-diff --git a/tpm2_pytss/encoding.py b/src/tpm2_pytss/encoding.py
-similarity index 100%
-rename from tpm2_pytss/encoding.py
-rename to src/tpm2_pytss/encoding.py
-diff --git a/tpm2_pytss/fapi_info.py b/src/tpm2_pytss/fapi_info.py
-similarity index 100%
-rename from tpm2_pytss/fapi_info.py
-rename to src/tpm2_pytss/fapi_info.py
-diff --git a/src/tpm2_pytss/internal/__init__.py b/src/tpm2_pytss/internal/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/tpm2_pytss/internal/constants.py b/src/tpm2_pytss/internal/constants.py
-similarity index 100%
-rename from tpm2_pytss/internal/constants.py
-rename to src/tpm2_pytss/internal/constants.py
-diff --git a/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py
-similarity index 100%
-rename from tpm2_pytss/internal/crypto.py
-rename to src/tpm2_pytss/internal/crypto.py
-diff --git a/tpm2_pytss/internal/templates.py b/src/tpm2_pytss/internal/templates.py
-similarity index 100%
-rename from tpm2_pytss/internal/templates.py
-rename to src/tpm2_pytss/internal/templates.py
-diff --git a/tpm2_pytss/internal/utils.py b/src/tpm2_pytss/internal/utils.py
-similarity index 100%
-rename from tpm2_pytss/internal/utils.py
-rename to src/tpm2_pytss/internal/utils.py
-diff --git a/tpm2_pytss/tsskey.py b/src/tpm2_pytss/tsskey.py
-similarity index 100%
-rename from tpm2_pytss/tsskey.py
-rename to src/tpm2_pytss/tsskey.py
-diff --git a/tpm2_pytss/types.py b/src/tpm2_pytss/types.py
-similarity index 100%
-rename from tpm2_pytss/types.py
-rename to src/tpm2_pytss/types.py
-diff --git a/tpm2_pytss/utils.py b/src/tpm2_pytss/utils.py
-similarity index 100%
-rename from tpm2_pytss/utils.py
-rename to src/tpm2_pytss/utils.py
---
-2.35.1
-
diff --git a/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild b/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
deleted file mode 100644
index d7f07c588526..000000000000
--- a/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for TSS"
-HOMEPAGE="
- https://pypi.org/project/tpm2-pytss
- https://github.com/tpm2-software/tpm2-pytss
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+fapi test"
-
-RDEPEND="app-crypt/tpm2-tss:=[fapi=]
- fapi? ( >=app-crypt/tpm2-tss-3.0.3:= )
- dev-python/cffi[${PYTHON_USEDEP}]
- dev-python/asn1crypto[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/pycparser[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- test? ( app-crypt/swtpm )"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
- dev-python/pkgconfig[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.0-src-move-package-under-src-directory.patch"
- )
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/tpm2-pytss/files/, dev-python/tpm2-pytss/
@ 2024-03-04 14:54 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2024-03-04 14:54 UTC (permalink / raw
To: gentoo-commits
commit: dedba7f86ed4bbce0dd5c750cecaec5d0c3a1acf
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Fri Jan 26 02:27:08 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 14:53:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedba7f8
dev-python/tpm2-pytss: support Python 3.12, dev-python/cryptography >= 42
Closes: https://bugs.gentoo.org/922900
Closes: https://bugs.gentoo.org/923240
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...ypto-fix-_MyRSAPrivateNumbers-with-crypto.patch | 73 ++++++++++++++++++++++
...e-pcr_set_auth_value-and-pcr_set_auth_pol.patch | 40 ++++++++++++
dev-python/tpm2-pytss/tpm2-pytss-2.1.0-r2.ebuild | 48 ++++++++++++++
3 files changed, 161 insertions(+)
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-2.1.0-internal-crypto-fix-_MyRSAPrivateNumbers-with-crypto.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-2.1.0-internal-crypto-fix-_MyRSAPrivateNumbers-with-crypto.patch
new file mode 100644
index 000000000000..4aaecd935c22
--- /dev/null
+++ b/dev-python/tpm2-pytss/files/tpm2-pytss-2.1.0-internal-crypto-fix-_MyRSAPrivateNumbers-with-crypto.patch
@@ -0,0 +1,73 @@
+From 0fbb9d099370c0a7031dd13990986538f586836a Mon Sep 17 00:00:00 2001
+From: Erik Larsson <who+github@cnackers.org>
+Date: Fri, 26 Jan 2024 12:01:41 +0100
+Subject: [PATCH 3/3] internal/crypto: fix _MyRSAPrivateNumbers with
+ cryptograpy >= 42.0.1
+
+RSAPrivateNumbers was moved to a rust implementation in 42.0.1.
+So inheritance is no longer possible, so turn the class into a
+wrapper instead of a subclass.
+
+Fixes #561
+
+Signed-off-by: Erik Larsson <who+github@cnackers.org>
+---
+ src/tpm2_pytss/internal/crypto.py | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/src/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py
+index 93e5181..42030c5 100644
+--- a/src/tpm2_pytss/internal/crypto.py
++++ b/src/tpm2_pytss/internal/crypto.py
+@@ -23,7 +23,7 @@ from cryptography.hazmat.primitives.ciphers.algorithms import AES, Camellia
+ 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.RSAPrivateNumbers):
+ 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.RSAPrivateNumbers):
+ #
+ @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):
+--
+2.43.0
+
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-2.1.0-test-disable-pcr_set_auth_value-and-pcr_set_auth_pol.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-2.1.0-test-disable-pcr_set_auth_value-and-pcr_set_auth_pol.patch
new file mode 100644
index 000000000000..6e99688b76ba
--- /dev/null
+++ b/dev-python/tpm2-pytss/files/tpm2-pytss-2.1.0-test-disable-pcr_set_auth_value-and-pcr_set_auth_pol.patch
@@ -0,0 +1,40 @@
+From c55775c30c06bf3a3066b4047cb51cb42f1e403d Mon Sep 17 00:00:00 2001
+From: Erik Larsson <who+github@cnackers.org>
+Date: Sat, 6 Jan 2024 06:25:54 +0100
+Subject: [PATCH 2/3] test: disable pcr_set_auth_value and pcr_set_auth_policy
+ tests for swtpm
+
+Since [commit][1] in libtpms setting auth values/policies for PCRs are no longer supported.
+
+[1]: https://github.com/stefanberger/libtpms/commit/af4fc0e66df6d012c61aee7c418148fb261d77a9
+
+Signed-off-by: Erik Larsson <who+github@cnackers.org>
+---
+ test/test_esapi.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/test_esapi.py b/test/test_esapi.py
+index 269a43b..e0b6d35 100644
+--- a/test/test_esapi.py
++++ b/test/test_esapi.py
+@@ -3585,6 +3585,8 @@ class TestEsys(TSS2_EsapiTest):
+ self.ectx.pcr_allocate(pcrsels, session3=object())
+
+ def test_pcr_set_auth_policy(self):
++ if getattr(self.tcti, "name", "") == "swtpm":
++ self.skipTest("pcr_set_auth_policy not supported by swtpm")
+
+ policy = b"0123456789ABCDEF0123456789ABCDEF"
+ self.ectx.pcr_set_auth_policy(policy, TPM2_ALG.SHA256, ESYS_TR.PCR20)
+@@ -3630,6 +3632,8 @@ class TestEsys(TSS2_EsapiTest):
+ )
+
+ def test_pcr_set_auth_value(self):
++ if getattr(self.tcti, "name", "") == "swtpm":
++ self.skipTest("pcr_set_auth_value not supported by swtpm")
+
+ self.ectx.pcr_set_auth_value(ESYS_TR.PCR20, b"password")
+ self.ectx.tr_set_auth(ESYS_TR.PCR20, b"password")
+--
+2.43.0
+
diff --git a/dev-python/tpm2-pytss/tpm2-pytss-2.1.0-r2.ebuild b/dev-python/tpm2-pytss/tpm2-pytss-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..0ec096900a00
--- /dev/null
+++ b/dev-python/tpm2-pytss/tpm2-pytss-2.1.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for TSS"
+HOMEPAGE="
+ https://pypi.org/project/tpm2-pytss
+ https://github.com/tpm2-software/tpm2-pytss
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+fapi test"
+
+RDEPEND="${PYTHON_DEPS}
+ app-crypt/tpm2-tss:=[fapi=]
+ fapi? ( >=app-crypt/tpm2-tss-3.0.3:= )
+ dev-python/cffi[${PYTHON_USEDEP}]
+ dev-python/asn1crypto[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/pycparser[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ test? ( app-crypt/swtpm )"
+
+BDEPEND="${PYTHON_DEPS}
+ dev-python/setuptools-scm[${PYTHON_USEDEP}]
+ dev-python/pkgconfig[${PYTHON_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.0-test-add-check-for-renamed-cryptography-types.patch"
+ "${FILESDIR}/${PN}-2.1.0-internal-crypto-fix-_MyRSAPrivateNumbers-with-crypto.patch"
+ "${FILESDIR}/${PN}-2.1.0-test-disable-pcr_set_auth_value-and-pcr_set_auth_pol.patch"
+ )
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/tpm2-pytss/files/, dev-python/tpm2-pytss/
@ 2024-12-02 14:50 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-12-02 14:50 UTC (permalink / raw
To: gentoo-commits
commit: bd60fb07f2716ed71b22201b32e7ba730e1a99da
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Mon Dec 2 03:26:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 2 14:48:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd60fb07
dev-python/tpm2-pytss: Fix compile under gcc-15
Added a patch to force "-std=c99" when preprocessing. As pcyparser only
supports completely C99, this shouldn't be an issue
Closes: https://bugs.gentoo.org/943997
Closes: https://bugs.gentoo.org/945056
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/tpm2-pytss-2.3.0-preprocess-as-C99.patch | 21 +++++++++++++++++++++
dev-python/tpm2-pytss/tpm2-pytss-2.3.0.ebuild | 4 ++++
2 files changed, 25 insertions(+)
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-2.3.0-preprocess-as-C99.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-2.3.0-preprocess-as-C99.patch
new file mode 100644
index 000000000000..582735bd81f3
--- /dev/null
+++ b/dev-python/tpm2-pytss/files/tpm2-pytss-2.3.0-preprocess-as-C99.patch
@@ -0,0 +1,21 @@
+diff --git a/setup.py b/setup.py
+index 1b5f513..0e6208f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -184,7 +184,7 @@ class type_generator(build_ext):
+ f"unable to find tss2_tpm2_types.h in {pk['include_dirs']}"
+ )
+ pdata = preprocess_file(
+- header_path, cpp_args=["-D__extension__=", "-D__attribute__(x)="]
++ header_path, cpp_args=["-std=c99", "-D__extension__=", "-D__attribute__(x)="]
+ )
+ parser = c_parser.CParser()
+ ast = parser.parse(pdata, "tss2_tpm2_types.h")
+@@ -205,6 +205,7 @@ class type_generator(build_ext):
+ pdata = preprocess_file(
+ policy_header_path,
+ cpp_args=[
++ "-std=c99",
+ "-D__extension__=",
+ "-D__attribute__(x)=",
+ "-D__float128=long double",
diff --git a/dev-python/tpm2-pytss/tpm2-pytss-2.3.0.ebuild b/dev-python/tpm2-pytss/tpm2-pytss-2.3.0.ebuild
index 9ad2962b3fa8..bad0a03aac9a 100644
--- a/dev-python/tpm2-pytss/tpm2-pytss-2.3.0.ebuild
+++ b/dev-python/tpm2-pytss/tpm2-pytss-2.3.0.ebuild
@@ -38,6 +38,10 @@ BDEPEND="
dev-python/setuptools-scm[${PYTHON_USEDEP}]
"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.0-preprocess-as-C99.patch"
+ )
+
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-02 14:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-05 13:07 [gentoo-commits] repo/gentoo:master commit in: dev-python/tpm2-pytss/files/, dev-python/tpm2-pytss/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-03-04 14:54 Joonas Niilola
2024-12-02 14:50 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox