.gitignore

@@ -1 +1 @@
-SOURCES/jwcrypto-0.8.tar.gz
+SOURCES/jwcrypto-0.5.0.tar.gz

.python-jwcrypto.metadata

@@ -1 +1 @@
-038ee5faf896548477c0b57c3cacb92add36e550 SOURCES/jwcrypto-0.8.tar.gz
+8eccc6fbeeee2fedc602998a7c7a97b8bd550e59 SOURCES/jwcrypto-0.5.0.tar.gz

SOURCES/0001-Address-potential-DoS-with-high-compression-ratio_rhel#28698.patch

@@ -1,74 +0,0 @@
-From 90477a3b6e73da69740e00b8161f53fea19b831f Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Tue, 5 Mar 2024 16:57:17 -0500
-Subject: [PATCH] Address potential DoS with high compression ratio
-
-Fixes CVE-2024-28102
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
----
- jwcrypto/jwe.py   |  7 +++++++
- jwcrypto/tests.py | 26 ++++++++++++++++++++++++++
- 2 files changed, 33 insertions(+)
-
-diff --git a/jwcrypto/jwe.py b/jwcrypto/jwe.py
-index 9412881..5df500b 100644
---- a/jwcrypto/jwe.py
-+++ b/jwcrypto/jwe.py
-@@ -10,5 +10,8 @@
- from jwcrypto.jwa import JWA
- 
-+# Limit the amount of data we are willing to decompress by default.
-+default_max_compressed_size = 256 * 1024
-+
- 
- # RFC 7516 - 4.1
- # name: (description, supported?)
-@@ -387,6 +387,10 @@ def _decrypt(self, key, ppe):
- 
-         compress = jh.get('zip', None)
-         if compress == 'DEF':
-+            if len(data) > default_max_compressed_size:
-+                raise InvalidJWEData(
-+                    'Compressed data exceeds maximum allowed'
-+                    'size' + f' ({default_max_compressed_size})')
-             self.plaintext = zlib.decompress(data, -zlib.MAX_WBITS)
-         elif compress is None:
-             self.plaintext = data
-diff --git a/jwcrypto/tests.py b/jwcrypto/tests.py
-index bb2ff10..59049f8 100644
---- a/jwcrypto/tests.py
-+++ b/jwcrypto/tests.py
-@@ -1526,6 +1526,32 @@ def test_pbes2_hs256_aeskw_custom_params(self):
-             token.deserialize(jwt=e)
-             json_decode(token.claims)
- 
-+    def test_jwe_decompression_max(self):
-+        key = jwk.JWK(kty='oct', k=base64url_encode(b'A' * (128 // 8)))
-+        payload = '{"u": "' + "u" * 400000000 + '", "uu":"' \
-+            + "u" * 400000000 + '"}'
-+        protected_header = {
-+            "alg": "A128KW",
-+            "enc": "A128GCM",
-+            "typ": "JWE",
-+            "zip": "DEF",
-+        }
-+        enc = jwe.JWE(payload.encode('utf-8'),
-+                      recipient=key,
-+                      protected=protected_header).serialize(compact=True)
-+        with self.assertRaises(jwe.InvalidJWEData):
-+            check = jwe.JWE()
-+            check.deserialize(enc)
-+            check.decrypt(key)
-+
-+        defmax = jwe.default_max_compressed_size
-+        jwe.default_max_compressed_size = 1000000000
-+        # ensure we can eraise the limit and decrypt
-+        check = jwe.JWE()
-+        check.deserialize(enc)
-+        check.decrypt(key)
-+        jwe.default_max_compressed_size = defmax
-+
- 
- class JWATests(unittest.TestCase):
-     def test_jwa_create(self):

SPECS/python-jwcrypto.spec

@@ -5,7 +5,7 @@
 %bcond_with python3
 %endif
 
-%if 0%{?fedora} > 31 || 0%{?rhel} > 7
+%if 0%{?rhel} > 7
 # Disable python2 build by default
 %bcond_with python2
 %else
@@ -15,25 +15,22 @@
 %global srcname jwcrypto
 
 Name:           python-%{srcname}
-Version:        0.8
-Release:        5%{?dist}
+Version:        0.5.0
+Release:        1.1%{?dist}
 Summary:        Implements JWK, JWS, JWE specifications using python-cryptography
 
 License:        LGPLv3+
 URL:            https://github.com/latchset/%{srcname}
 Source0:        https://github.com/latchset/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz
 
-Patch1:         0001-Address-potential-DoS-with-high-compression-ratio_rhel#28698.patch
-
 BuildArch:      noarch
-%if 0%{?with_python2}
+%if %{with python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-cryptography >= 1.5
 BuildRequires:  python2-pytest
 %endif
-
-%if 0%{?with_python3}
+%if %{with python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-cryptography >= 1.5
@@ -43,8 +40,7 @@ BuildRequires:  python%{python3_pkgversion}-pytest
 %description
 Implements JWK, JWS, JWE specifications using python-cryptography
 
-
-%if 0%{?with_python2}
+%if %{with python2}
 %package -n python2-%{srcname}
 Summary:        Implements JWK,JWS,JWE specifications using python-cryptography
 Requires:       python2-cryptography >= 1.5
@@ -54,8 +50,7 @@ Requires:       python2-cryptography >= 1.5
 Implements JWK, JWS, JWE specifications using python-cryptography
 %endif
 
-
-%if 0%{?with_python3}
+%if %{with python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Implements JWK, JWS, JWE specifications using python-cryptography
 Requires:       python%{python3_pkgversion}-cryptography >= 1.5
@@ -69,45 +64,39 @@ Implements JWK, JWS, JWE specifications using python-cryptography
 %prep
 %setup -q -n %{srcname}-%{version}
 
-%autopatch -p 1
 
 %build
-%if 0%{?with_python2}
+%if %{with python2}
 %py2_build
 %endif
-%if 0%{?with_python3}
+%if %{with python3}
 %py3_build
 %endif
 
 
 %check
-%if 0%{?with_python2}
+%if %{with python2}
 %{__python2} -bb -m pytest %{srcname}/test*.py
 %endif
-%if 0%{?with_python3}
+%if %{with python3}
 %{__python3} -bb -m pytest %{srcname}/test*.py
 %endif
 
 
 %install
-%if 0%{?with_python2}
+%if %{with python2}
 %py2_install
-%endif
-%if 0%{?with_python3}
-%py3_install
-%endif
-
 rm -rf %{buildroot}%{_docdir}/%{srcname}
-%if 0%{?with_python2}
 rm -rf %{buildroot}%{python2_sitelib}/%{srcname}/tests{,-cookbook}.py*
 %endif
-%if 0%{?with_python3}
+%if %{with python3}
+%py3_install
 rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/tests{,-cookbook}.py*
 rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*.py*
 %endif
+rm -rf %{buildroot}/usr/share/doc/jwcrypto
 
-
-%if 0%{?with_python2}
+%if %{with python2}
 %files -n python2-%{srcname}
 %doc README.md
 %license LICENSE
@@ -115,7 +104,7 @@ rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*
 %{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
 %endif
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python%{python3_pkgversion}-%{srcname}
 %doc README.md
 %license LICENSE
@@ -125,65 +114,18 @@ rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*
 
 
 %changelog
-* Thu Apr 04 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.8-5
-- Address potential DoS with high compression ratio
-  Resolves: RHEL-28698
+* Fri Jun 17 2022 Christian Heimes <cheimes@redhat.com> - 0.5.0-1.1
+- Bump dist to solve version sorting issue, fixes RHBZ#2097800
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.8-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.8-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 01 2020 Simo Sorce <simo@redhat.com> - 0.8-1
-- Sync with upstream release 0.8
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-8
-- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-6
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 29 2019 Christian Heimes <cheimes@redhat.com> - 0.6.0-5
-- Remove Python 2 subpackages from F32+
-- Resolves: RHBZ #1746760
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Nov 05 2018 Christian Heimes <cheimes@redhat.com> - 0.6.0-1
-- New upstream release 0.6.0
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.0-2
-- Rebuilt for Python 3.7
-
-* Wed Jun 27 2018 Christian Heimes <cheimes@redhat.com> - 0.5.0-1
+* Thu Jun 28 2018 Christian Heimes <cheimes@redhat.com> - 0.5.0-1
 - New upstream release 0.5.0
+- Fixes Coverity scan issue
 
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.2-5
-- Rebuilt for Python 3.7
+* Mon Apr 16 2018 Christian Heimes <cheimes@redhat.com> - 0.4.2-5
+- Drop Python 2 subpackages from RHEL 8, fixes RHBZ#1567152
 
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Thu Nov 23 2017 Christian Heimes <cheimes@redhat.com> - 0.4.2-4
+- Build Python 3 package on RHEL > 7, fixes RHBZ#1516813
 
 * Wed Aug 02 2017 Christian Heimes <cheimes@redhat.com> - 0.4.2-3
 - Run tests with bytes warning