rpms/jitterentropy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to the upstream v3.3.1 @ 887c9871

Browse Source 
Resolves: rhbz#2015560

Signed-off-by: Vladis Dronov <vdronov@redhat.com>
This commit is contained in:
Vladis Dronov 2021-11-23 17:21:18 +01:00
parent db86cc6d5a
commit 0fa5349a15
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/jitterentropy-library-3.0.2.tar.gz
/jitterentropy-library-3.3.1.tar.gz

26
jitterentropy-fix-ec-check.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up src/jitterentropy-noise.c.orig src/jitterentropy-noise.c
--- src/jitterentropy-noise.c 2021-11-23 15:42:47.809329173 +0100
+++ src/jitterentropy-noise.c 2021-11-23 15:44:19.820499338 +0100
@@ -188,16 +188,18 @@ static void jent_memaccess(struct rand_d
uint32_t u[4];
uint8_t b[sizeof(uint32_t) * 4];
} prngState = { .u = {0x8e93eec0, 0xce65608a, 0xa8d46b46, 0xe83cef69} };
- uint32_t addressMask = ec->memmask;
+ uint32_t addressMask;
+
+ if (NULL == ec || NULL == ec->mem)
+ return;
+
+ addressMask = ec->memmask;
/* Ensure that macros cannot overflow jent_loop_shuffle() */
BUILD_BUG_ON((MAX_ACC_LOOP_BIT + MIN_ACC_LOOP_BIT) > 63);
uint64_t acc_loop_cnt =
jent_loop_shuffle(ec, MAX_ACC_LOOP_BIT, MIN_ACC_LOOP_BIT);
- if (NULL == ec || NULL == ec->mem)
- return;
-
/*
* Mix the current data into prngState
*

11
jitterentropy.spec
View File

@ -1,6 +1,6 @@
Name: jitterentropy
Version: 3.0.2
Release: 3.git.409828cf%{?dist}
Version: 3.3.1
Release: 1%{?dist}
Summary: Library implementing the jitter entropy source
License: BSD or GPLv2
@ -12,6 +12,8 @@ BuildRequires: make
# Disable Upstream Makefiles debuginfo strip on install
Patch0: jitterentropy-rh-makefile.patch
# Fix ec check for NULL
Patch1: jitterentropy-fix-ec-check.patch
%description
Library implementing the CPU jitter entropy source
@ -24,7 +26,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Development headers and libraries for jitterentropy
%prep
%autosetup -n %{name}-library-%{version}
%autosetup -p0 -n %{name}-library-%{version}
%build
%set_build_flags
@ -45,6 +47,9 @@ mkdir -p %{buildroot}/usr/include/
%{_mandir}/man3/*
%changelog
* Tue Nov 23 2021 Vladis Dronov <vdronov@redhat.com> - 3.3.1-1
- Update to the upstream v3.3.1 @ 887c9871 (bz 2015560)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.2-3.git.409828cf
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688

2
sources
View File

@ -1 +1 @@
SHA512 (jitterentropy-library-3.0.2.tar.gz) = 57ad498048c728da79247d1f93d60b60d4c3a8967a45b6ac0d205457f9f93f1001c9a0359e91588084dd81889a700fcac162e179947f4d68266d59a033a61386
SHA512 (jitterentropy-library-3.3.1.tar.gz) = 7dc17c377cf90d38057bbc135e00730a3f84bc66aeed83eca1ad1b0e1c2fb89c5346ec20bdf25d3ce27f1d21893d44e52c08e96175554c18dfa1934a8d4fd9f7