From c18b19caeef4494bf890e6ba1c93d0d19959de4c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 27 Sep 2022 07:33:45 -0400 Subject: [PATCH] import python-suds-0.7-0.11.94664ddd46a6.el8 --- SOURCES/bz1921920-fix-fips-issue.patch | 14 +++++++------- SPECS/python-suds.spec | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SOURCES/bz1921920-fix-fips-issue.patch b/SOURCES/bz1921920-fix-fips-issue.patch index df2fa63..90cdbad 100644 --- a/SOURCES/bz1921920-fix-fips-issue.patch +++ b/SOURCES/bz1921920-fix-fips-issue.patch @@ -1,4 +1,4 @@ -From 56caa0af4f21d696df50be5fc15b74c74239d130 Mon Sep 17 00:00:00 2001 +From 75e4a9eb929520d95cb55b2d850af7ba849fd014 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Mon, 28 Feb 2022 11:23:55 +0100 Subject: [PATCH] Use usedforsecurity=False for md5() calls to make suds work @@ -10,7 +10,7 @@ Subject: [PATCH] Use usedforsecurity=False for md5() calls to make suds work 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/suds/reader.py b/suds/reader.py -index 31c5ee7..d31b147 100644 +index 31c5ee7..3354b5d 100644 --- a/suds/reader.py +++ b/suds/reader.py @@ -58,7 +58,12 @@ def mangle(self, name, x): @@ -19,16 +19,16 @@ index 31c5ee7..d31b147 100644 """ - h = md5(name.encode()).hexdigest() + try: -+ h = md5(name.encode()).hexdigest() -+ except ValueError: + # FIPS requires usedforsecurity=False and might not be + # available on all distros: https://bugs.python.org/issue9216 + h = md5(name.encode(), usedforsecurity=False).hexdigest() ++ except AttributeError: ++ h = md5(name.encode()).hexdigest() return '%s-%s' % (h, x) diff --git a/suds/wsse.py b/suds/wsse.py -index 96d9eb6..a871657 100644 +index 96d9eb6..474d15a 100644 --- a/suds/wsse.py +++ b/suds/wsse.py @@ -158,7 +158,12 @@ def setnonce(self, text=None): @@ -37,11 +37,11 @@ index 96d9eb6..a871657 100644 s.append(Token.sysdate()) - m = md5() + try: -+ m = md5() -+ except ValueError: + # FIPS requires usedforsecurity=False and might not be + # available on all distros: https://bugs.python.org/issue9216 + m = md5(usedforsecurity=False) ++ except AttributeError: ++ m = md5() m.update(':'.join(s)) self.nonce = m.hexdigest() else: diff --git a/SPECS/python-suds.spec b/SPECS/python-suds.spec index b68bb17..204e301 100644 --- a/SPECS/python-suds.spec +++ b/SPECS/python-suds.spec @@ -28,7 +28,7 @@ services and WSDL based objects can be easily inspected. Summary: %{sum} Name: python-suds Version: 0.7 -Release: 0.10.%{shortcommit}%{?dist} +Release: 0.11.%{shortcommit}%{?dist} Source0: https://bitbucket.org/jurko/suds/get/%{shortcommit}.tar.bz2 Patch0: fix_http_test.patch Patch1: bz1921920-fix-fips-issue.patch @@ -117,7 +117,7 @@ popd %endif %changelog -* Tue Mar 1 2022 Oyvind Albrigtsen - 0.7-0.10.94664ddd46a6 +* Tue Mar 8 2022 Oyvind Albrigtsen - 0.7-0.11.94664ddd46a6 - Fix FIPS issue Resolves: rhbz#1921920