Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d208d1e18 | |||
| e7ed64a85f |
@ -1,36 +0,0 @@
|
||||
--- a/crt/aws-c-cal/source/der.c 2025-08-29 10:43:04.487705098 +0100
|
||||
+++ B/crt/aws-c-cal/source/der.c 2025-08-29 14:27:00.649373755 +0100
|
||||
@@ -80,21 +80,28 @@
|
||||
if (len_bytes & 0x80) {
|
||||
len_bytes &= 0x7f;
|
||||
switch (len_bytes) {
|
||||
- case 1:
|
||||
- if (!aws_byte_cursor_read_u8(cur, (uint8_t *)&len)) {
|
||||
+ case 1: {
|
||||
+ uint8_t len8;
|
||||
+ if (!aws_byte_cursor_read_u8(cur, &len8)) {
|
||||
return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
|
||||
}
|
||||
+ len = len8;
|
||||
break;
|
||||
- case 2:
|
||||
- if (!aws_byte_cursor_read_be16(cur, (uint16_t *)&len)) {
|
||||
+ }
|
||||
+ case 2: {
|
||||
+ uint16_t len16;
|
||||
+ if (!aws_byte_cursor_read_be16(cur, &len16)) {
|
||||
return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
|
||||
}
|
||||
+ len = len16;
|
||||
break;
|
||||
- case 4:
|
||||
+ }
|
||||
+ case 4: {
|
||||
if (!aws_byte_cursor_read_be32(cur, &len)) {
|
||||
return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
|
||||
}
|
||||
break;
|
||||
+ }
|
||||
default:
|
||||
return aws_raise_error(AWS_ERROR_CAL_MALFORMED_ASN1_ENCOUNTERED);
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
diff --git a/crt/s2n/crypto/s2n_fips.c b/crt/s2n/crypto/s2n_fips.c
|
||||
index 13f9f77c0..b8af2e36e 100644
|
||||
--- a/crt/s2n/crypto/s2n_fips.c
|
||||
+++ b/crt/s2n/crypto/s2n_fips.c
|
||||
@@ -57,15 +57,15 @@ int s2n_fips_init(void)
|
||||
{
|
||||
s2n_fips_mode_enabled = s2n_libcrypto_is_fips();
|
||||
|
||||
- /* When using Openssl, ONLY 3.0 currently supports FIPS.
|
||||
- * openssl-1.0.2-fips is no longer supported.
|
||||
- * openssl >= 3.5 will likely have a FIPS 140-3 certificate instead of a
|
||||
- * FIPS 140-2 certificate, which will require additional review in order
|
||||
- * to properly integrate.
|
||||
- */
|
||||
-#if defined(OPENSSL_FIPS) || S2N_OPENSSL_VERSION_AT_LEAST(3, 5, 0)
|
||||
- POSIX_ENSURE(!s2n_fips_mode_enabled, S2N_ERR_FIPS_MODE_UNSUPPORTED);
|
||||
-#endif
|
||||
+// /* When using Openssl, ONLY 3.0 currently supports FIPS.
|
||||
+// * openssl-1.0.2-fips is no longer supported.
|
||||
+// * openssl >= 3.5 will likely have a FIPS 140-3 certificate instead of a
|
||||
+// * FIPS 140-2 certificate, which will require additional review in order
|
||||
+// * to properly integrate.
|
||||
+// */
|
||||
+// #if defined(OPENSSL_FIPS) || S2N_OPENSSL_VERSION_AT_LEAST(3, 5, 0)
|
||||
+// POSIX_ENSURE(!s2n_fips_mode_enabled, S2N_ERR_FIPS_MODE_UNSUPPORTED);
|
||||
+// #endif
|
||||
|
||||
return S2N_SUCCESS;
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git a/test/test_websocket.py b/test/test_websocket.py
|
||||
index fcbcedb..ebebbcb 100644
|
||||
--- a/test/test_websocket.py
|
||||
+++ b/test/test_websocket.py
|
||||
@@ -122,6 +122,7 @@ class WebSocketServer:
|
||||
# that the asyncio server thread has finished startup.
|
||||
self._server_started_event = threading.Event()
|
||||
self._server_thread = threading.Thread(target=self._run_server_thread)
|
||||
+ self._current_connection = None
|
||||
|
||||
def __enter__(self):
|
||||
# main thread is entering the `with` block: start the server...
|
||||
@@ -179,6 +180,13 @@ class WebSocketServer:
|
||||
self._current_connection = None
|
||||
|
||||
def send_async(self, msg):
|
||||
+ # Wait for a connection to be established before trying to send
|
||||
+ max_wait = time() + TIMEOUT
|
||||
+ while self._current_connection is None:
|
||||
+ if time() > max_wait:
|
||||
+ raise RuntimeError("Timeout waiting for WebSocket connection to be established")
|
||||
+ sleep(0.01)
|
||||
+
|
||||
asyncio.run_coroutine_threadsafe(self._current_connection.send(msg), self._server_loop)
|
||||
|
||||
|
||||
@ -1,11 +1,20 @@
|
||||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.6.5)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 1;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||
## END: Set by rpmautospec
|
||||
|
||||
%global desc %{expand:
|
||||
Python bindings for the AWS Common Runtime}
|
||||
|
||||
|
||||
|
||||
|
||||
Name: python-awscrt
|
||||
Version: 0.27.2
|
||||
Release: 2%{?dist}
|
||||
|
||||
Release: %autorelease
|
||||
Summary: Python bindings for the AWS Common Runtime
|
||||
# All files are licensed under Apache-2.0, except:
|
||||
# - crt/aws-c-common/include/aws/common/external/cJSON.h is MIT
|
||||
@ -13,112 +22,97 @@ Summary: Python bindings for the AWS Common Runtime
|
||||
# - crt/s2n/pq-crypto/kyber_r3/KeccakP-brg_endian_avx2.h is BSD-3-Clause
|
||||
License: Apache-2.0 AND MIT AND BSD-3-Clause
|
||||
URL: https://github.com/awslabs/aws-crt-python
|
||||
|
||||
|
||||
Source0: %{pypi_source awscrt}
|
||||
|
||||
|
||||
# two tests require internet connection, skip them
|
||||
Patch0: skip-tests-requiring-network.patch
|
||||
# SHA1 is deprecated - remove it from tests
|
||||
# skip SHA1 in test_crypto
|
||||
Patch1: skip-SHA1-in-test_crypto.patch
|
||||
# https://github.com/awslabs/aws-c-cal/pull/225
|
||||
Patch2: der-c.patch
|
||||
# websockets test fail fix
|
||||
Patch3: websockets.patch
|
||||
# Remove FIPS version check to build with OpenSSL 3.x
|
||||
Patch4: s2n-remove-fips-version-check.patch
|
||||
|
||||
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: openssl-devel
|
||||
|
||||
|
||||
BuildRequires: python%{python3_pkgversion}-websockets
|
||||
|
||||
|
||||
|
||||
# s390x: https://bugzilla.redhat.com/show_bug.cgi?id=2180988
|
||||
ExcludeArch: %{ix86} s390x
|
||||
|
||||
|
||||
%description
|
||||
%{desc}
|
||||
|
||||
|
||||
|
||||
|
||||
%package -n python%{python3_pkgversion}-awscrt
|
||||
Summary: %{summary}
|
||||
|
||||
|
||||
|
||||
|
||||
%description -n python%{python3_pkgversion}-awscrt
|
||||
%{desc}
|
||||
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n awscrt-%{version}
|
||||
|
||||
|
||||
# relax version requirements
|
||||
sed -i -e 's/setuptools>=75\.3\.1/setuptools/' -e 's/wheel>=0\.45\.1/wheel/' pyproject.toml
|
||||
|
||||
# Remove websocket test for now
|
||||
# TODO: fix the test properly
|
||||
rm -f test/test_websocket.py
|
||||
|
||||
# fix for osci.rpmdeplint test - package builds with the name 'unknown'
|
||||
sed -i '/setuptools\.setup(/a\ name="awscrt",' setup.py
|
||||
|
||||
|
||||
|
||||
# stay compatible with websockets<13
|
||||
sed -i 's/websockets\.asyncio\.server/websockets.server/' test/test_websocket.py
|
||||
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires
|
||||
|
||||
|
||||
|
||||
%build
|
||||
export AWS_CRT_BUILD_USE_SYSTEM_LIBCRYPTO=1
|
||||
%pyproject_wheel
|
||||
|
||||
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
%pyproject_save_files _awscrt awscrt
|
||||
|
||||
|
||||
|
||||
|
||||
%check
|
||||
PYTHONPATH="%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}" %{python3} -m unittest
|
||||
|
||||
|
||||
|
||||
|
||||
%files -n python%{python3_pkgversion}-awscrt -f %{pyproject_files}
|
||||
%doc README.md
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 26 2025 Kseniia Nivnia <knivnia@redhat.com> - 0.27.2-2
|
||||
- Add patch fixing FIPS mode crash in awscli2
|
||||
Resolves: RHEL-131280
|
||||
## START: Generated by rpmautospec
|
||||
* Tue Jul 15 2025 Kseniia Nivnia <knivnia@redhat.com> - 0.27.2-1
|
||||
- Update to version 0.27.2 and revise existing patches Resolves:
|
||||
RHEL-103640
|
||||
|
||||
* Fri Sep 05 2025 Kseniia Nivnia <knivnia@redhat.com> - 0.27.2-1
|
||||
- Update to 0.27.2
|
||||
Resolves: RHEL-113230
|
||||
* Mon Feb 24 2025 Kseniia Nivnia <knivnia@redhat.com> - 0.23.8-1
|
||||
- Update to 0.23.8 and add skip-testing-sha1.patch
|
||||
|
||||
* Mon Apr 29 2024 Major Hayden <major@redhat.com> - 0.20.5-3
|
||||
- Removing extra pkcs11 source now that upstream switched to public domain headers
|
||||
* Wed Dec 18 2024 Kseniia Nivnia <101121921+knivnia@users.noreply.github.com> - 0.20.2-6
|
||||
- add gating.yaml
|
||||
|
||||
* Mon Apr 01 2024 Major Hayden <major@redhat.com> - 0.20.5-2
|
||||
- Bump revision for new build
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.20.2-5
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
|
||||
* Wed Mar 27 2024 Major Hayden <major@redhat.com> - 0.20.5-1
|
||||
- Update to 0.20.5
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.20.2-4
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Tue Mar 19 2024 Major Hayden <major@redhat.com> - 0.20.2-4
|
||||
- Bump revision number for new build
|
||||
* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Feb 13 2024 Major Hayden <major@redhat.com> - 0.20.2-3
|
||||
- Remove the third party license file from excluded pkcs11.h
|
||||
|
||||
* Mon Feb 12 2024 Major Hayden <major@redhat.com> - 0.20.2-2
|
||||
- Replacing upstream's pkcs11.h with Simo's public domain version.
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Jan 02 2024 Packit <hello@packit.dev> - 0.20.2-1
|
||||
- [packit] 0.20.2 upstream release
|
||||
- Resolves rhbz#2254450
|
||||
|
||||
* Wed Dec 06 2023 Nikola Forró <nforro@redhat.com> - 0.19.19-2
|
||||
- Add Packit config
|
||||
|
||||
* Thu Nov 30 2023 Packit <hello@packit.dev> - 0.19.19-1
|
||||
- [packit] 0.19.19 upstream release
|
||||
- Resolves rhbz#2250726
|
||||
@ -137,5 +131,58 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}" %{py
|
||||
* Mon Oct 02 2023 Packit <hello@packit.dev> - 0.19.2-1
|
||||
- [packit] 0.19.2 upstream release
|
||||
|
||||
* Fri Aug 25 2023 Nikola Forró <nforro@redhat.com> - 0.18.0-1
|
||||
- Initial import for EPEL 9
|
||||
* Mon Sep 11 2023 Nikola Forró <nforro@redhat.com> - 0.19.1-2
|
||||
- Enable EPEL 9 in Packit config
|
||||
|
||||
* Mon Aug 28 2023 Packit <hello@packit.dev> - 0.19.1-1
|
||||
- [packit] 0.19.1 upstream release
|
||||
|
||||
* Fri Aug 11 2023 Packit <hello@packit.dev> - 0.18.0-1
|
||||
- [packit] 0.18.0 upstream release
|
||||
|
||||
* Thu Jul 27 2023 Packit <hello@packit.dev> - 0.17.0-1
|
||||
- [packit] 0.17.0 upstream release
|
||||
|
||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.25-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jul 17 2023 Packit <hello@packit.dev> - 0.16.25-1
|
||||
- [packit] 0.16.25 upstream release
|
||||
|
||||
* Mon Jul 10 2023 Packit <hello@packit.dev> - 0.16.24-1
|
||||
- [packit] 0.16.24 upstream release
|
||||
|
||||
* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 0.16.21-2
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Fri Jun 16 2023 Packit <hello@packit.dev> - 0.16.21-1
|
||||
- [packit] 0.16.21 upstream release
|
||||
|
||||
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 0.16.19-4
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Thu Jun 15 2023 Nikola Forró <nforro@redhat.com> - 0.16.19-3
|
||||
- Backport a commit improving Python 3.12 compatibility
|
||||
|
||||
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 0.16.19-2
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Wed May 31 2023 Packit <hello@packit.dev> - 0.16.19-1
|
||||
- [packit] 0.16.19 upstream release
|
||||
|
||||
* Wed May 24 2023 Packit <hello@packit.dev> - 0.16.18-1
|
||||
- [packit] 0.16.18 upstream release
|
||||
|
||||
* Fri May 05 2023 Packit <hello@packit.dev> - 0.16.17-1
|
||||
- [packit] 0.16.17 upstream release
|
||||
|
||||
* Wed Apr 26 2023 Nikola Forró <nforro@redhat.com> - 0.16.16-1
|
||||
- New upstream release 0.16.16
|
||||
|
||||
* Wed Mar 22 2023 Nikola Forró <nforro@redhat.com> - 0.16.13-2
|
||||
- Workaround a crash on %%ix86
|
||||
|
||||
* Thu Mar 16 2023 Nikola Forró <nforro@redhat.com> - 0.16.13-1
|
||||
- Initial package
|
||||
|
||||
## END: Generated by rpmautospec
|
||||
|
||||
Loading…
Reference in New Issue
Block a user