gentoo auto-resync : 02:01:2025 - 06:31:11

4 files changed, 0 insertions, 167 deletions

diff --git a/dev-python/tpm2-pytss/Manifest b/dev-python/tpm2-pytss/Manifest
index f3d689dc89af..e91e59f29e10 100644
--- a/dev-python/tpm2-pytss/Manifest
+++ b/dev-python/tpm2-pytss/Manifest
@@ -1,6 +1,3 @@
-AUX tpm2-pytss-2.2.1-Revert-test-skip-some-FAPI-tests-if-testing-agains-t.patch 3152 BLAKE2B 8fc273a652720dd11ba697516f30bcbd5acee740dfed649355f8e25de97394b1c7c5d1f338801f14fa9618445f85e850ab40238d78c601dd22ed6e2db686115b SHA512 1c713002e215f0b5be5c436753e390d9f2e3b8b8ca4350ea5246685ed8d6beb87d858fd7c9cd1b24908af0e1057dfe7474c6e091e95a782c3bc430aa327b50d7
-AUX tpm2-pytss-2.2.1-cryptography-fixes-for-newer-version-of-cryptography.patch 1944 BLAKE2B b7f9e517427b2b25dc42730b7b39bf055f890b66c6f0b34e04ee495755fc98162c1af11d2520b9b08aa16396e1c574116e5ffb323ce41dbc0ab7fba4a2b4438d SHA512 ae6a8f9d544b4770a58821655cfd622cc6ed0d6e556cc40dc58097715ccf4d3fa84db82ead598409b50d73a2d63924d7519aa9ffef530456c65be1ae5ad13812
-AUX tpm2-pytss-2.2.1-scripts-update-regex-for-defines.patch 1048 BLAKE2B 3d858726c61b216e5e22ed4af4ef0d34a68030d4260c15aa76f2516a3ccb130d6e6003e54fb35f8614e17751fdb91834ecd1b502825214bd29dba453c9e7ed36 SHA512 56033320e62b25a1b5da1241dd3fa8f1170d9320c575ca46a66fc255f26a9c807cd4425fada5cdd18626468281f3f9303faff4fd1e276ab2e0e2f7c1e0284222
 AUX tpm2-pytss-2.3.0-preprocess-as-C99.patch 897 BLAKE2B 7be1b909b918ac4506ff9db90a2803b5a3f60c482785774a50c8647d11d3a3f871482a23dedcb9f0db0bd547aa15a60ca3178535230fd5a42153d79788ca87a3 SHA512 bf7a08edf2e18cdae0d2fa2d024b095c9880a941b09a00b2cd10c2a66d3cfc1c5db545ac54615b072d50c1da8eee4a3342f652e7bf219d9f0ef94195a7bd8601
 DIST tpm2-pytss-2.3.0.tar.gz 213848 BLAKE2B 7e9264ab53cfe666991150fe2c0efdd973f7b58b4968b557d6494156ba4d362bd147f580f2ef50b85ac1b43cd9fc4921d71eea42d5a14b9379f82d45b6a6b536 SHA512 d0f76aec77afa773ec0ed7878a0ca4ef3b3475aa64f219d7a5afd89cbca795457536b0a9b5ffa14704200dcb35a89df36f9fc799694f7cc3cfbf98ea551628b1
 EBUILD tpm2-pytss-2.3.0.ebuild 1004 BLAKE2B bea7c9d373d1076386a49756b4c6db831f922a514d8d35146eec5b2e9a7dac510fbdac5aa8b6ea37fce07598bff34fbd02aa93d0db2e9cddce57936dd6a8aaf6 SHA512 d6d046900dfaa88abb9fb92c4b9ae7579fe1b95a7156ee57b4a67988642a7bc8919a3f16ad0b138d21a00ccc9cd214244a3e2bafbaf6eea4c5c7e1c986de447d
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-Revert-test-skip-some-FAPI-tests-if-testing-agains-t.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-Revert-test-skip-some-FAPI-tests-if-testing-agains-t.patch
deleted file mode 100644
index ff18af2015c6..000000000000
--- a/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-Revert-test-skip-some-FAPI-tests-if-testing-agains-t.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From a04715c5ef5bc3d6b30b1354d64db1762bc42b9c Mon Sep 17 00:00:00 2001
-From: Erik Larsson <who+github@cnackers.org>
-Date: Fri, 12 Apr 2024 19:49:52 +0200
-Subject: [PATCH 1/2] Revert "test: skip some FAPI tests if testing agains
- tpm2-tss master branch."
-
-This reverts commit 9e948984676b38f71e923a6e167340dc99554ac0.
-
-Fixed in tpm2-tss master branch, so remove the temporary fixes.
-
-Signed-off-by: Erik Larsson <who+github@cnackers.org>
----
- test/test_fapi.py | 19 +++++--------------
- 1 file changed, 5 insertions(+), 14 deletions(-)
-
-diff --git a/test/test_fapi.py b/test/test_fapi.py
-index f702fc9..6b77c66 100644
---- a/test/test_fapi.py
-+++ b/test/test_fapi.py
-@@ -13,7 +13,7 @@ from cryptography.hazmat.primitives.asymmetric.padding import PSS
- 
- from tpm2_pytss import *
- 
--from tpm2_pytss.internal.utils import is_bug_fixed, _lib_version_atleast
-+from tpm2_pytss.internal.utils import is_bug_fixed
- 
- from .TSS2_BaseTest import TpmSimulator
- from tpm2_pytss.TSS2_Exception import TSS2_Exception
-@@ -614,8 +614,7 @@ class Common:
-         self.fapi.sign(key_path, b"\x22" * 32)
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+        not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-         reason="tpm2-tss bug, see #2084",
-     )
-     def test_write_authorize_nv(self, esys):
-@@ -662,8 +661,7 @@ class Common:
-             self.fapi.quote(path=key_path, pcrs=[7, 9])
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+        not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-         reason="tpm2-tss bug, see #2084",
-     )
-     def test_authorize_policy(self, sign_key):
-@@ -728,9 +726,7 @@ class Common:
-             self.fapi.quote(path=key_path, pcrs=[7, 9])
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2"),
--        reason="tpm2-tss bug, see #2080",
-+        not is_bug_fixed(fixed_in="3.2"), reason="tpm2-tss bug, see #2080"
-     )
-     def test_policy_signed(self, cryptography_key):
-         # create external signing key used by the signing authority external to the TPM
-@@ -792,10 +788,6 @@ class Common:
-         with pytest.raises(TSS2_Exception):
-             self.fapi.sign(path=key_path, digest=b"\x11" * 32)
- 
--    @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170"),
--        reason="issue on master branch.",
--    )
-     def test_policy_branched(self):
-         pcr_index = 15
-         pcr_data = b"ABCDEF"
-@@ -913,8 +905,7 @@ class Common:
-         self.fapi.delete(path=nv_path)
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+        not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-         reason="tpm2-tss bug, see #2089",
-     )
-     def test_policy_action(self):
--- 
-2.43.2
-
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-cryptography-fixes-for-newer-version-of-cryptography.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-cryptography-fixes-for-newer-version-of-cryptography.patch
deleted file mode 100644
index 2938e1938940..000000000000
--- a/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-cryptography-fixes-for-newer-version-of-cryptography.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5a33c767be196328948baef569de084d97d62384 Mon Sep 17 00:00:00 2001
-From: Erik Larsson <who+github@cnackers.org>
-Date: Tue, 26 Mar 2024 13:25:10 +0100
-Subject: [PATCH] cryptography: fixes for newer version of cryptography
-
-Signed-off-by: Erik Larsson <who+github@cnackers.org>
----
- src/tpm2_pytss/internal/crypto.py | 1 +
- test/test_encoding.py             | 2 +-
- test/test_policy.py               | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py
-index 42030c5..f9d8c34 100644
---- a/src/tpm2_pytss/internal/crypto.py
-+++ b/src/tpm2_pytss/internal/crypto.py
-@@ -25,6 +25,7 @@ from cryptography.hazmat.backends import default_backend
- from cryptography.exceptions import UnsupportedAlgorithm, InvalidSignature
- from typing import Tuple, Type, Any
- import secrets
-+import inspect
- import sys
- 
- _curvetable = (
-diff --git a/test/test_encoding.py b/test/test_encoding.py
-index 1f58562..8cf4b51 100644
---- a/test/test_encoding.py
-+++ b/test/test_encoding.py
-@@ -1406,7 +1406,7 @@ class ToolsTest(TSS2_BaseTest):
-     def test_tools_decode_tpm2b_name(self):
-         if not self.has_tools:
-             self.skipTest("tools not in path")
--        key = ec.generate_private_key(ec.SECP256R1).public_key()
-+        key = ec.generate_private_key(ec.SECP256R1()).public_key()
-         kb = key.public_bytes(
-             serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo
-         )
-diff --git a/test/test_policy.py b/test/test_policy.py
-index f18aa8a..5f56e21 100644
---- a/test/test_policy.py
-+++ b/test/test_policy.py
-@@ -47,7 +47,7 @@ class TestPolicy(TSS2_EsapiTest):
-         super().setUp()
-         self._has_secp192r1 = True
-         try:
--            ec.generate_private_key(ec.SECP192R1)
-+            ec.generate_private_key(ec.SECP192R1())
-         except Exception:
-             self._has_secp192r1 = False
- 
--- 
-2.43.2
-
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-scripts-update-regex-for-defines.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-scripts-update-regex-for-defines.patch
deleted file mode 100644
index 99f65025434f..000000000000
--- a/dev-python/tpm2-pytss/files/tpm2-pytss-2.2.1-scripts-update-regex-for-defines.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b02fdc8e259fe977c1065389c042be69e2985bdf Mon Sep 17 00:00:00 2001
-From: Erik Larsson <who+github@cnackers.org>
-Date: Sat, 20 Apr 2024 10:32:55 +0200
-Subject: [PATCH 2/2] scripts: update regex for #defines
-
-Commit fdb3594b27aee315ad56af361512800266672582 in tpm2-tss changed
-the structure of some defines, so fix the regex.
-
-Signed-off-by: Erik Larsson <who+github@cnackers.org>
----
- scripts/prepare_headers.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scripts/prepare_headers.py b/scripts/prepare_headers.py
-index 6ca9b64..a7529b3 100644
---- a/scripts/prepare_headers.py
-+++ b/scripts/prepare_headers.py
-@@ -32,6 +32,7 @@ def remove_common_guards(s):
- 
-     # Restructure #defines with ...
-     s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\) \(.*?\)\)", "\g<1>...", s)
-+    s = re.sub("(#define [A-Za-z0-9_]+) +\(\(\(.*?\) .*\)", "\g<1>...", s)
-     s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\).*?\) ", "\g<1>...", s)
-     s = re.sub(
-         "(#define [A-Za-z0-9_]+) .*\n.*?.*\)\)", "\g<1>...", s, flags=re.MULTILINE
--- 
-2.43.2
-