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

!7 delete # of patch in spec

Browse Source 
Merge pull request !7 from yanan-rock/20.09
This commit is contained in:
openeuler-ci-bot 2020-08-31 09:30:02 +08:00 committed by Gitee
commit 1cb8c77904
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libgcrypt-1.8.3-md-fips-enforce.patch
View File

@ -1,12 +1,18 @@
diff -up libgcrypt-1.8.3/cipher/md.c.fips-enforce libgcrypt-1.8.3/cipher/md.c
--- libgcrypt-1.8.3/cipher/md.c.fips-enforce 2018-11-01 15:40:36.051865535 +0100
+++ libgcrypt-1.8.3/cipher/md.c 2019-06-03 11:50:21.435401753 +0200
@@ -409,7 +409,7 @@ md_enable (gcry_md_hd_t hd, int algorith
--- libgcrypt-1.8.3/cipher/md.c.fips-enforce 2017-11-23 19:16:58.000000000 +0100
+++ libgcrypt-1.8.3/cipher/md.c 2020-04-17 15:07:31.364945130 +0200
@@ -409,13 +409,10 @@ md_enable (gcry_md_hd_t hd, int algorith
}
- if (!err && algorithm == GCRY_MD_MD5 && fips_mode ())
+ if (!err && !spec->flags.fips && fips_mode ())
{
- _gcry_inactivate_fips_mode ("MD5 used");
if (_gcry_enforced_fips_mode () )
{
- /* We should never get to here because we do not register
- MD5 in enforced fips mode. But better throw an error. */
err = GPG_ERR_DIGEST_ALGO;
}
}

4
libgcrypt-1.8.5-getrandom.patch
View File

@ -281,5 +281,5 @@ diff -up libgcrypt-1.8.5/src/global.c.getrandom libgcrypt-1.8.5/src/global.c
+
+ in_constructor = 0;
}
/* This function is called by the macro fips_is_operational and makes
/* This function is called by the macro fips_is_operational and makes

22
libgcrypt.spec
View File

@ -4,7 +4,7 @@
Name: libgcrypt
Version: 1.8.6
Release: 1
Release: 2
Summary: A general-purpose cryptography library
License: LGPLv2+
URL: https://www.gnupg.org/
@ -20,13 +20,13 @@ Patch13: libgcrypt-1.6.1-mpicoder-gccopt.patch
Patch14: libgcrypt-1.7.3-ecc-test-fix.patch
Patch18: libgcrypt-1.8.3-fips-ctor.patch
Patch22: libgcrypt-1.7.3-fips-reqs.patch
#Patch24: libgcrypt-1.8.5-getrandom.patch
#Patch25: libgcrypt-1.8.3-cmac-selftest.patch
#Patch26: libgcrypt-1.8.3-fips-enttest.patch
#Patch27: libgcrypt-1.8.3-md-fips-enforce.patch
#Patch28: libgcrypt-1.8.5-intel-cet.patch
#Patch29: libgcrypt-1.8.5-fips-module.patch
#Patch30: libgcrypt-1.8.5-aes-perf.patch
Patch24: libgcrypt-1.8.5-getrandom.patch
Patch25: libgcrypt-1.8.3-cmac-selftest.patch
Patch26: libgcrypt-1.8.3-fips-enttest.patch
Patch27: libgcrypt-1.8.3-md-fips-enforce.patch
Patch28: libgcrypt-1.8.5-intel-cet.patch
Patch29: libgcrypt-1.8.5-fips-module.patch
Patch30: libgcrypt-1.8.5-aes-perf.patch
Patch6004: CVE-2019-12904-1.patch
Patch6005: CVE-2019-12904-2.patch
@ -136,6 +136,12 @@ install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf
%{_infodir}/gcrypt.info*
%changelog
* Sun Aug 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.8.6-2
- Type:bugfix
- ID:NA
- SUG:restart
- DESC:delete # of patch in spec
* Sun Jul 26 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.8.6-1
- update to 1.8.6 from upstream