packages/rpm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!379 Fix the calculation of hdr size

Browse Source 
From: @HuaxinLuGitee 
Reviewed-by: @xujing99 
Signed-off-by: @xujing99
This commit is contained in:
openeuler-ci-bot 2024-08-22 11:25:35 +00:00 committed by Gitee
commit a64c60cb67
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Add-digest-list-plugin.patch
View File

@ -363,7 +363,7 @@ index 0000000..715b8d6
+ return -EACCES; + return -EACCES;
+ +
+ /* Check if the signature has already included a header */ + /* Check if the signature has already included a header */
+ hdr_exist = (st.st_size - sizeof(sig_hdr)) % 128 == 0 ? 1 : 0; + hdr_exist = st.st_size % 128 == 0 ? 0 : 1;
+ if (!hdr_exist) { + if (!hdr_exist) {
+ ret = fill_pgp_signature_header(te, sig_hdr); + ret = fill_pgp_signature_header(te, sig_hdr);
+ if (ret < 0) + if (ret < 0)

5
rpm.spec
View File

@ -1,6 +1,6 @@
Name: rpm Name: rpm
Version: 4.18.2 Version: 4.18.2
Release: 11 Release: 12
Summary: RPM Package Manager Summary: RPM Package Manager
License: GPLv2+ License: GPLv2+
URL: http://www.rpm.org/ URL: http://www.rpm.org/
@ -337,6 +337,9 @@ make clean
%exclude %{_mandir}/man8/rpmspec.8.gz %exclude %{_mandir}/man8/rpmspec.8.gz
%changelog %changelog
* Thu Aug 22 2024 luhuaxin <luhuaxin1@huawei.com> - 4.18.2-12
- Fix the calculation of hdr size
* Tue Aug 20 2024 luhuaxin <luhuaxin1@huawei.com> - 4.18.2-11 * Tue Aug 20 2024 luhuaxin <luhuaxin1@huawei.com> - 4.18.2-11
- Fix the wrong IMA signature header check - Fix the wrong IMA signature header check