3c00769e65
Sync patches from Fedora 43, to fix multiple pccs npm security flaws, and fix typo in pccsadmin help text. CVE-2026-23745, CVE-2026-23950, CVE-2026-24842, CVE-2025-13465, CVE-2025-15284 Resolves: RHEL-145005, RHEL-144190, RHEL-142482, RHEL-138075, RHEL-140108 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From eca1c479b23dd8e8c87e90988204c08b5e0c3edc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Fri, 4 Oct 2024 17:41:37 +0100
|
|
Subject: [PATCH 104/136] pccsadmin: only import 'pypac' module on Windows
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The PACSession object is only used in a code path that runs on
|
|
Windows, so don't try to import this on Linux, to avoid the
|
|
redundant dependency.
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
tools/PccsAdminTool/lib/intelsgx/pcs.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/PccsAdminTool/lib/intelsgx/pcs.py b/tools/PccsAdminTool/lib/intelsgx/pcs.py
|
|
index 9f1d2245..046c781d 100644
|
|
--- a/tools/PccsAdminTool/lib/intelsgx/pcs.py
|
|
+++ b/tools/PccsAdminTool/lib/intelsgx/pcs.py
|
|
@@ -5,8 +5,9 @@ import json
|
|
import binascii
|
|
from urllib import parse
|
|
from OpenSSL import crypto
|
|
-from pypac import PACSession
|
|
from platform import system
|
|
+if system() == 'Windows':
|
|
+ from pypac import PACSession
|
|
from lib.intelsgx.credential import Credentials
|
|
from requests.adapters import HTTPAdapter
|
|
from urllib3.util import Retry
|
|
--
|
|
2.52.0
|
|
|