.crypto-policies.metadata

@@ -1 +1 @@
-8fe9be3f275cc392417de1c44d15fe4269b609c2 SOURCES/crypto-policies-git03b28b3.tar.gz
+731e23be60f0b6183f8d37978c36a07377ebc47a SOURCES/crypto-policies-git3177e06.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/crypto-policies-git03b28b3.tar.gz
+SOURCES/crypto-policies-git3177e06.tar.gz

SPECS/crypto-policies.spec

@@ -1,45 +1,23 @@
-%global git_commit 03b28b32c3dd992c251b9a05352f1234582c18e4
+%global git_date 20230731
+%global git_commit 3177e06c203c082d479760337c7cad65a4dcc81e
 %{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})}
 
 %global _python_bytecompile_extra 0
 
-# RSAMinSize vs RequiredRSASize vs nothing, remove when OpenSSH >= 9.1
-%if 0%{?rhel} == 9
-  # RHEL-9: must be RequiredRSASize in RHEL >= 9.2, Conflicts-enforced,
-  %global MIN_RSA_NAME RequiredRSASize
-%elif 0%{?rhel} == 10
-  # ELN: RequiredRSASize for openssh >= 9.0p1-5, RSAMinSize for >= 9.0p1-2
-  %if v"%(rpm -q openssh | head -n1)" >= v"openssh-9.0p1-5"
-    %global MIN_RSA_NAME RequiredRSASize
-  %elif v"%(rpm -q openssh | head -n1)" >= v"openssh-9.0p1-2"
-    %global MIN_RSA_NAME RSAMinSize
-  %else
-    %global MIN_RSA_NAME none
-  %endif
-%else
-  # some other distro, follow autodetection which checks for openssh >= 9.1
-  %if v"%(rpm -q openssh | head -n1)" >= v"openssh-9.1"
-    %global MIN_RSA_NAME RequiredRSASize
-  %else
-    %global MIN_RSA_NAME none
-  %endif
-%endif
-
 Name:           crypto-policies
-Version:        20221215
-Release:        1.git9a18988%{?dist}.1
+Version:        %{git_date}
+Release:        1.git%{git_commit_hash}%{?dist}
 Summary:        System-wide crypto policies
 
 License:        LGPLv2+
 URL:            https://gitlab.com/redhat-crypto/fedora-crypto-policies
-# For RHEL-9.2 we use the upstream branch rhel9.2 and are freezing version at 20221215-1.git9a18988.
+# For RHEL-8 we use the upstream branch rhel8
 Source0:        https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/archive/%{git_commit_hash}/%{name}-git%{git_commit_hash}.tar.gz
 
 BuildArch: noarch
 BuildRequires: asciidoc
 BuildRequires: libxslt
 BuildRequires: openssl
-BuildRequires: nss-tools
 BuildRequires: gnutls-utils >= 3.6.0
 BuildRequires: java-1.8.0-openjdk-devel
 BuildRequires: bind
@@ -47,15 +25,21 @@ BuildRequires: perl-interpreter
 BuildRequires: perl-generators
 BuildRequires: perl(File::pushd), perl(File::Temp), perl(File::Copy)
 BuildRequires: perl(File::Which)
-BuildRequires: python3-devel >= 3.6
+BuildRequires: python3-devel
 BuildRequires: python3-pytest
-BuildRequires: make
+BuildRequires: python3-coverage
 
-Conflicts: openssl < 1:3.0.1-10
-Conflicts: nss < 3.90.0
+Conflicts: nss < 3.44.0
 Conflicts: libreswan < 3.28
-Conflicts: openssh < 8.7p1-24
-Conflicts: gnutls < 3.7.6-21.el9_2
+Conflicts: openssl < 1.1.1k
+Conflicts: openssh < 8.0p1-5
+Conflicts: gnutls < 3.6.12
+Conflicts: libssh < 0.9.4
+# Most users want this, the split is mostly for minimal images
+Recommends: crypto-policies-scripts
+
+# Self-obsolete to install both subpackages after split
+Obsoletes: %{name} < 20200527-1.git0a29b28
 
 %description
 This package provides pre-built configuration files with
@@ -65,8 +49,7 @@ such as SSL/TLS libraries.
 %package scripts
 Summary: Tool to switch between crypto policies
 Requires: %{name} = %{version}-%{release}
-Recommends: (grubby if kernel)
-Provides: fips-mode-setup = %{version}-%{release}
+Recommends: grubby
 
 %description scripts
 This package provides a tool update-crypto-policies, which applies
@@ -82,10 +65,6 @@ to enable or disable the system FIPS mode.
 %autopatch -p1
 
 %build
-sed -i \
-  "s/MIN_RSA_DEFAULT = .*/MIN_RSA_DEFAULT = '%{MIN_RSA_NAME}'/" \
-  python/policygenerators/openssh.py
-grep "MIN_RSA_DEFAULT = '%{MIN_RSA_NAME}'" python/policygenerators/openssh.py
 %make_build
 
 %install
@@ -103,9 +82,6 @@ install -p -m 644 default-config %{buildroot}%{_sysconfdir}/crypto-policies/conf
 touch %{buildroot}%{_sysconfdir}/crypto-policies/state/current
 touch %{buildroot}%{_sysconfdir}/crypto-policies/state/CURRENT.pol
 
-# Drop pre-generated EMPTY policy, we do not need to ship it
-rm -rf %{buildroot}%{_datarootdir}/crypto-policies/EMPTY
-
 # Create back-end configs for mounting with read-only /etc/
 for d in LEGACY DEFAULT FUTURE FIPS ; do
     mkdir -p -m 755 %{buildroot}%{_datarootdir}/crypto-policies/back-ends/$d
@@ -121,15 +97,7 @@ done
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/crypto-policies/python
 
 %check
-# RSAMinSize vs RequiredRSASize vs nothing, remove when OpenSSH >= 9.1
-%if "%{MIN_RSA_NAME}" == "none"
-  sed -i '/RequiredRSASize .*/d' tests/outputs/*.txt
-%elif "%{MIN_RSA_NAME}" == "RSAMinSize"
-  sed -i 's/RequiredRSASize/RSAMinSize/' tests/outputs/*.txt
-%else
-  [ "%{MIN_RSA_NAME}" == "RequiredRSASize" ] || exit 7
-%endif
-make ON_RHEL9=1 test
+make ON_RHEL8=1 test
 
 %post -p <lua>
 if not posix.access("%{_sysconfdir}/crypto-policies/config") then
@@ -186,11 +154,9 @@ end
 %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/nss.config
 %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/bind.config
 %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/java.config
-%ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/javasystem.config
 %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/krb5.config
 %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/libreswan.config
 %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/libssh.config
-%ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/openssl_fips.config
 # %verify(not mode) comes from the fact
 # these turn into symlinks and back to regular files at will, see bz1898986
 
@@ -202,11 +168,13 @@ end
 %{_datarootdir}/crypto-policies/DEFAULT
 %{_datarootdir}/crypto-policies/FUTURE
 %{_datarootdir}/crypto-policies/FIPS
+%{_datarootdir}/crypto-policies/EMPTY
 %{_datarootdir}/crypto-policies/back-ends
 %{_datarootdir}/crypto-policies/default-config
 %{_datarootdir}/crypto-policies/reload-cmds.sh
 %{_datarootdir}/crypto-policies/policies
 
+%{!?_licensedir:%global license %%doc}
 %license COPYING.LESSER
 
 %files scripts
@@ -220,296 +188,155 @@ end
 %{_mandir}/man8/fips-finish-install.8*
 
 %changelog
-* Wed Aug 02 2023 Alexander Sosedkin <asosedkin@redhat.com> - 20221215-1.git9a18988.1
-- FIPS: enforce EMS in FIPS mode
-- NO-ENFORCE-EMS: add subpolicy to undo the EMS enforcement in FIPS mode
-- nss: implement EMS enforcement in FIPS mode
-- openssl: implement EMS enforcement in FIPS mode
-- gnutls: implement EMS enforcement in FIPS mode
+* Tue Jul 31 2023 Alexander Sosedkin <asosedkin@redhat.com> - 20230731-1.git3177e06
+- krb5: sort enctypes mac-first, cipher-second, prioritize SHA-2 ones
+- krb5: fix policy generator to account for macs
 - docs: replace `FIPS 140-2` with just `FIPS 140`
 
-* Thu Dec 15 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20221215-1.git9a18988
+* Thu Dec 15 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20221215-1.gitece0092
 - bind: expand the list of disableable algorithms
+- tests/java: fix java.security.disableSystemPropertiesFile=true
+- stop accidentally creating /etc/crypto-policies/back-ends/.config symlink
 
-* Mon Oct 03 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20221003-1.git04dee29
-- openssh: rename RSAMinSize option to RequiredRSASize
-
-* Mon Aug 15 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20220815-1.git0fbe86f
-- openssh: add RSAMinSize option following min_rsa_size
-
-* Wed Apr 27 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20220427-1.gitb2323a1
-- bind: control ED25519/ED448
-
-* Mon Apr 04 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20220404-1.git845c0c1
-- DEFAULT: drop DNSSEC SHA-1 exception
-- openssh: add support for sntrup761x25519-sha512@openssh.com
-
-* Wed Feb 23 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20220223-1.git5203b41
-- openssl: allow SHA-1 signatures with rh-allow-sha1-signatures in LEGACY
-- update AD-SUPPORT, move RC4 enctype enabling to AD-SUPPORT-LEGACY
-- fips-mode-setup: catch more inconsistencies, clarify --check
-
-* Thu Feb 03 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20220203-1.gitf03e75e
-- gnutls: enable SHAKE, needed for Ed448
-- fips-mode-setup: improve handling FIPS plus subpolicies
-- FIPS: disable SHA-1 HMAC
-- FIPS: disable CBC ciphers except in Kerberos
-
-* Tue Feb 01 2022 Alexander Sosedkin <asosedkin@redhat.com> - 20220201-1.git636a91d
-- openssl: revert to SECLEVEL=2 in LEGACY
-- openssl: add newlines at the end of the output
-
-* Mon Nov 15 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20211115-1.git70de135
+* Tue Nov 16 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20211116-1.gitae470d6
 - OSPP: relax -ECDSA-SHA2-512, -FFDHE-*
 - fips-mode-setup, fips-finish-install: call zipl more often (s390x-specific)
-
-* Wed Sep 22 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210922-1.git6fb269b
+- libssh: enable diffie-hellman-group14-sha256 support
 - openssl: fix disabling ChaCha20
-- update for pylint 2.11
 
-* Tue Sep 14 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210914-1.git97d08ef
-- gnutls: reorder ECDSA-SECPMMMR1-SHANNN together with ECDSA-SHANNN
-- fix several issues with update-crypto-policies --check
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20210707-2.git29f6c0b
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jul 07 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210707-1.git29f6c0b
-- gnutls: explicitly enable ECDSA-SECPNNNR1-SHANNN
-- packaging: adapt to the RHEL-9 %check-time testing tools availability
-
-* Mon Jun 28 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210628-1.gitdd7d273
-- implement scoped policies, e.g., cipher@SSH = ...
+* Thu Jun 17 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210617-1.gitc776d3e
+- implement scoped policies, e.g., cipher@SSH = ... (#1960266)
 - implement algorithm globbing, e.g., cipher@SSH = -*-CBC
 - deprecate derived properties:
-  tls_cipher, ssh_cipher, ssh_group, ike_protocol, sha1_in_dnssec
+  tls_cipher, ssh_cipher, ssh_group, ike_protocol
+- deprecate sha1_in_dnssec property
 - deprecate unscoped form of protocol property
-- openssl: set MinProtocol / MaxProtocol separately for TLS and DTLS
-- openssh: use PubkeyAcceptedAlgorithms instead of PubkeyAcceptedKeyTypes
-- libssh: respect ssh_certs
-- restrict FIPS:OSPP further
-- improve Python 3.10 compatibility
 - update documentation
 - expand upstream test coverage
-- FUTURE: disable CBC ciphers for all backends but krb5
-- openssl: LEGACY must have SECLEVEL=1, enabling SHA1
-- disable DHE-DSS in LEGACY
-- bump LEGACY key size requirements from 1023 to 1024
-- add javasystem backend
-- *ssh: condition ecdh-sha2-nistp384 on SECP384R1
-- set %verify(not mode) for backend sometimes-symlinks-sometimes-not
-- gnutls: use allowlisting
+- openssl: set MinProtocol / MaxProtocol separately for TLS and DTLS (#1946522)
+- support AES-192 ciphers in custom policies for non-TLS scenarios (#1876846)
+- stop claiming Camellia is disabled (#1925104)
+- disable CBC ciphers in FUTURE for everything but Kerberos (#1933016)
+- drop SHA224 from signature algorithms in FIPS:OSPP (#1934755)
+- condition ecdh-sha2-nistp384 on SECP384R1
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 20210218-3.git2246c55
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
+* Tue Feb 09 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210209-1.gitbfb6bed
+- OSPP subpolicy: tweak for RHEL-8.3+
+- libssh: respect ssh_certs
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 20210218-2.git2246c55
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Feb 18 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210218-1.git2246c55
-- require 2048 bit params in LEGACY
-- require TLSv1.2/DTLSv1.2 in all policies
-- disable DSA
-- disable 3DES in LEGACY
-- drop FFDHE-1024 from LEGACY
-- drop (sub)policies we're not going to offer in RHEL-9
-
-* Sat Feb 13 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210213-1.git5c710c0
-- exclude RC4 from LEGACY
-- introduce rc4_md5_in_krb5 to narrow AD_SUPPORT's impact
-- an assortment of small fixes
-
-* Wed Jan 27 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210127-2.gitb21c811
-- fix comparison in %post lua scriptlet
-
-* Wed Jan 27 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210127-1.gitb21c811
-- don't create /etc/crypto-policies/back-ends/.config in %post
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210118-2.gitb21c811
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jan 18 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210118-1.gitb21c811
-- output sigalgs required by nss >=3.59 (or 3.60 in Fedora case)
-- bump Python requirement to 3.6
-
-* Tue Dec 15 2020 Alexander Sosedkin <asosedkin@redhat.com> - 20201215-1.giteb57e00
-- Kerberos 5: Fix policy generator to account for macs
-
-* Tue Dec 08 2020 Alexander Sosedkin <asosedkin@redhat.com> - 20201208-1.git70def9f
-- add AES-192 support (non-TLS scenarios)
-- add documentation of the --check option
-
-* Wed Sep 23 2020 Tomáš Mráz <tmraz@redhat.com> - 20200918-1.git85dccc5
-- add RSA-PSK algorithm support
-- add GOST algorithms support for openssl
-- add GOST-ONLY policy and fix GOST subpolicy
-- update-crypto-policies: added --check parameter to perform
-  comparison of actual configuration files with the policy
-
-* Thu Aug 13 2020 Tomáš Mráz <tmraz@redhat.com> - 20200813-1.git66d4068
-- libreswan: enable X25519 group
-- libreswan: properly disable FFDH in ECDHE-ONLY subpolicy
-- libreswan: add generation of authby parameter based on sign property
-- libssh: Add diffie-hellman-group14-sha256
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200702-2.gitc40cede
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 13 2020 Tomáš Mráz <tmraz@redhat.com> - 20200702-1.gitc40cede
+* Mon Jul 13 2020 Tomáš Mráz <tmraz@redhat.com> - 20200713-1.git51d1222
 - OSPP subpolicy: remove AES-CCM
 - openssl: handle the AES-CCM removal properly
-- openssh/libssh: drop CBC ciphersuites from DEFAULT and FIPS
-- add AD-SUPPORT subpolicy which re-enables RC4 for Kerberos
-- gnutls: disallow X448/ED448 in FIPS policy
-- merge fips-mode-setup package into the scripts subpackage
 
-* Thu Jun 25 2020 Tomáš Mráz <tmraz@redhat.com> - 20200625-1.gitb298a9e
-- DEFAULT policy: Drop DH < 2048 bits, TLS 1.0, 1.1, SHA-1
-- make the NEXT policy just an alias for DEFAULT as they are now identical
-- policies: introduce sha1_in_dnssec value for BIND
-- add SHA1 and FEDORA32 policy modules to provide backwards compatibility
-  they can be applied as DEFAULT:SHA1 or DEFAULT:FEDORA32
-- avoid duplicates of list items in resulting policy
+* Wed Jul  1 2020 Tomáš Mráz <tmraz@redhat.com> - 20200629-1.git806b5d3
+- disallow X448/ED448 in FIPS policy with gnutls >= 3.6.12
+- add AD-SUPPORT policy module
 
-* Wed Jun 24 2020 Tomáš Mráz <tmraz@redhat.com> - 20200619-1.git781bbd4
-- gnutls: enable DSA signatures in LEGACY
-
-* Wed Jun 10 2020 Tomáš Mráz <tmraz@redhat.com> - 20200610-1.git7f9d474
-- openssh server: new format of configuration to be loaded by config include
+* Wed Jun 10 2020 Tomáš Mráz <tmraz@redhat.com> - 20200610-1.git0ac8b1f
 - fallback to FIPS policy instead of the default-config in FIPS mode
 - java: Document properly how to override the crypto policy
+- krb5: No support for 3des anymore
 - reorder the signature algorithms to follow the order in default openssl list
 
 * Tue Jun  9 2020 Tomáš Mráz <tmraz@redhat.com> - 20200527-5.gitb234a47
 - make the post script work in environments where /proc/sys is not available
 
 * Fri May 29 2020 Tomáš Mráz <tmraz@redhat.com> - 20200527-4.gitb234a47
-- move the symlink fix-up script to post and fix it
-
-* Fri May 29 2020 Tomáš Mráz <tmraz@redhat.com> - 20200527-3.gitb234a47
 - automatically set up FIPS policy in FIPS mode on first install
 
-* Thu May 28 2020 Tomáš Mráz <tmraz@redhat.com> - 20200527-2.gitb234a47
-- require the base package from scripts subpackage
-- add Recommends for fips-mode-setup to the scripts subpackage
-
-* Wed May 27 2020 Tomáš Mráz <tmraz@redhat.com> - 20200527-1.gitb234a47
+* Thu May 28 2020 Tomáš Mráz <tmraz@redhat.com> - 20200527-2.git63fc906
 - explicitly enable DHE-DSS in gnutls config if enabled in policy
 - use grubby with --update-kernel=ALL to avoid breaking kernelopts
 - OSPP subpolicy: Allow GCM for SSH protocol
 - openssh: Support newly standardized ECDHE-GSS and DHE-GSS key exchanges
 - if the policy in FIPS mode is not a FIPS policy print a message
 - openssl: Add SignatureAlgorithms support
-
-* Thu Mar 12 2020 Tomáš Mráz <tmraz@redhat.com> - 20200312-1.git3ae59d2
 - custom crypto policies: enable completely overriding contents of the list
   value
 - added ECDHE-ONLY.pmod policy module example
 - openssh: make LEGACY policy to prefer strong public key algorithms
-- openssh: support FIDO/U2F (with the exception of FIPS policy)
-- gnutls: add support for GOST ciphers
 - various python code cleanups
 - update-crypto-policies: dump the current policy to
   /etc/crypto-policies/state/CURRENT.pol
+- split scripts into their own subpackage
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20191128-5.gitcd267a5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 14 2020 Tomáš Mráz <tmraz@redhat.com> - 20191128-4.gitcd267a5
-- the base package must ship the DEFAULT policy config symlinks in case
-  the scripts package is not installed via the weak dependency
-
-* Tue Jan 07 2020 Andrew Jeddeloh <ajeddelo@redhat.com> 20191128-3.gitcd267a5
-- split scripts into their own subpackage. See
-  https://github.com/coreos/fedora-coreos-tracker/issues/280 for more details.
-
-* Mon Dec 16 2019 Tomáš Mráz <tmraz@redhat.com> - 20191128-2.gitcd267a5
+* Mon Dec 16 2019 Tomáš Mráz <tmraz@redhat.com> - 20191128-2.git23e1bf1
 - move the pre-built .config files to /usr/share/crypto-policies/back-ends
 
-* Thu Nov 28 2019 Tomáš Mráz <tmraz@redhat.com> - 20191128-1.gitcd267a5
-- add FIPS subpolicy for OSPP
-- fips-mode-setup: do not reload daemons when changing policy
-- fips-mode-setup: gracefully handle OSTree-based systems
-- gnutls: use new configuration file format
+* Fri Nov 29 2019 Tomáš Mráz <tmraz@redhat.com> - 20191128-1.git23e1bf1
+- fips-mode-setup: compatibility with RHCOS
 
-* Tue Oct 29 2019 Tomáš Mráz <tmraz@redhat.com> - 20191002-1.gitc93dc99
+* Thu Nov 28 2019 Tomáš Mráz <tmraz@redhat.com> - 20191127-1.git1179826
+- add FIPS subpolicy for OSPP
+
+* Tue Oct 29 2019 Tomáš Mráz <tmraz@redhat.com> - 20191022-1.gite17cc3a
+- custom crypto policies support
 - update-crypto-policies: fix handling of list operations in policy modules
 - update-crypto-policies: fix updating of the current policy marker
 - fips-mode-setup: fixes related to containers and non-root execution
-
-* Tue Sep 24 2019 Tomáš Mráz <tmraz@redhat.com> - 20190816-4.gitbb9bf99
-- add the /etc/crypto-policies/state directory
-
-* Tue Sep 10 2019 Tomáš Mráz <tmraz@redhat.com> - 20190816-3.gitbb9bf99
 - make it possible to use fips-mode-setup --check without dracut
 - add .config symlinks so a crypto policy can be set with read-only
   /etc by bind-mounting /usr/share/crypto-policies/<policy> to
   /etc/crypto-policies/back-ends
-
-* Mon Aug 19 2019 Tomáš Mráz <tmraz@redhat.com> - 20190816-2.gitbb9bf99
 - run the update-crypto-policies in posttrans
-- the current config should work fine with OpenSSL >= 7.9p1
-- fix the python bytecompilation
 
-* Fri Aug 16 2019 Tomáš Mráz <tmraz@redhat.com> - 20190816-1.gitbb9bf99
-- custom crypto policies support
-- openssh: Support new configuration option CASignatureAlgorithms
-- libssh: Add libssh as supported backend
-- multiple fixes in fips-mode-setup, BLS support
+* Wed Aug  7 2019 Tomáš Mráz <tmraz@redhat.com> - 20190807-1.git9b1477b
+- gnutls: enable TLS-1.3 in the FIPS policy
 
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190527-2.git0b3add8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Mon Aug  5 2019 Tomáš Mráz <tmraz@redhat.com> - 20190613-2.git21ffdc8
+- fix ownership of policy directories
+- nss: enable X25519 in appropriate policies and conflict with old nss
+- openssh: conflict with old incompatible openssh version
 
-* Mon May 27 2019 Tomáš Mráz <tmraz@redhat.com> - 20190211-1.git0b3add8
-- libreswan: coalesce proposals to avoid IKE packet fragmentation
+* Thu Jun 13 2019 Tomáš Mráz <tmraz@redhat.com> - 20190613-1.git21ffdc8
 - openssh: add missing curve25519-sha256 to the key exchange list
-- nss: map X25519 to CURVE25519
+- openssh: fix RSA certificate support
+- fips-mode-setup: drop the kernel boot option if there is no separate
+  /boot drive
+- fips-finish-install: regenerate all initramdisks
+- add libssh configuration backend
 
-* Thu Apr 25 2019 Tomáš Mráz <tmraz@redhat.com> - 20190211-4.gite3eacfc
-- do not fail in the Java test if the EMPTY policy is not really empty
+* Mon Feb 18 2019 Tomáš Mráz <tmraz@redhat.com> - 20181217-6.git9a35207
+- libreswan: Allow coalescing the IKE/IPSEC proposals
 
-* Thu Mar  7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 20190211-3.gite3eacfc
-- Split out fips-mode-setup into separate subpackage
+* Fri Feb  8 2019 Tomáš Mráz <tmraz@redhat.com> - 20181217-5.git9a35207
+- cleanups of the crypto-policies.7 manual page
 
-* Mon Feb 11 2019 Tomáš Mráz <tmraz@redhat.com> - 20190211-2.gite3eacfc
-- add crypto-policies.7 manual page
+* Fri Feb  1 2019 Tomáš Mráz <tmraz@redhat.com> - 20181217-4.git9a35207
 - Java: Fix FIPS and FUTURE policy to allow RSA certificates in TLS
+
+* Tue Jan 22 2019 Tomáš Mráz <tmraz@redhat.com> - 20181217-3.git9a35207
 - cleanup duplicate and incorrect information from update-crypto-policies.8
   manual page
+
+* Mon Jan 21 2019 Tomáš Mráz <tmraz@redhat.com> - 20181217-2.git9a35207
+- add crypto-policies.7 manual page
+
+* Mon Dec 17 2018 Tomáš Mráz <tmraz@redhat.com> - 20181217-1.git9a35207
 - update-crypto-policies: Fix endless loop
 - update-crypto-policies: Add warning about the need of system restart
-- FUTURE: Add mistakenly ommitted EDDSA-ED25519 signature algorithm
-- openssh: Add missing SHA2 variants of RSA certificates to the policy
-- return exit code 2 when printing usage from all the tools
-- update-crypto-policies: add --no-reload option for testing
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20181122-2.git70769d9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+- fips-mode-setup: Use grub2-editenv to modify the kernelopts for BLS
 
 * Thu Nov 22 2018 Tomáš Mráz <tmraz@redhat.com> - 20181122-1.git70769d9
 - update-crypto-policies: fix error on multiple matches in local.d
-
-* Tue Nov 20 2018 Tomáš Mráz <tmraz@redhat.com> - 20181120-1.gitd2b3bc4
 - Print warning when update-crypto-policies --set is used in the FIPS mode
 - Java: Add 3DES and RC4 to legacy algorithms in LEGACY policy
 - OpenSSL: Properly disable non AEAD and AES128 ciphersuites in FUTURE
 - libreswan: Add chacha20_poly1305 to all policies and drop ikev1 from LEGACY
 
-* Fri Oct 26 2018 Tomáš Mráz <tmraz@redhat.com> - 20181026-1.gitd42aaa6
+* Fri Oct 26 2018 Tomáš Mráz <tmraz@redhat.com> - 20181026-1.gitcc78cb7
 - Fix regression in discovery of additional configuration
 - NSS: add DSA keyword to LEGACY policy
 - GnuTLS: Add 3DES and RC4 to LEGACY policy
 
-* Tue Sep 25 2018 Tomáš Mráz <tmraz@redhat.com> - 20180925-1.git71ca85f
+* Tue Sep 25 2018 Tomáš Mráz <tmraz@redhat.com> - 20180925-2.git3ce363a
+- Improve the package description
+
+* Tue Sep 25 2018 Tomáš Mráz <tmraz@redhat.com> - 20180925-1.git3ce363a
 - Use Recommends instead of Requires for grubby
 - Revert setting of HostKeyAlgorithms for ssh client for now
 
-* Fri Sep 21 2018 Tomáš Mráz <tmraz@redhat.com> - 20180921-2.git391ed9f
-- Fix requires for grubby
-
-* Fri Sep 21 2018 Tomáš Mráz <tmraz@redhat.com> - 20180921-1.git391ed9f
+* Fri Sep 21 2018 Tomáš Mráz <tmraz@redhat.com> - 20180921-1.git62bafde
 - OpenSSH: Generate policy for sign algorithms
 - Enable >= 255 bits EC curves in FUTURE policy
 - OpenSSH: Add group1 key exchanges in LEGACY policy
@@ -517,11 +344,12 @@ end
 - Print warning when update-crypto-policies --set FIPS is used
 - fips-mode-setup: Kernel boot options are now modified with grubby
 
-* Thu Aug  2 2018 Tomáš Mráz <tmraz@redhat.com> - 20180802-1.git1626592
-- Introduce NEXT policy
+* Mon Aug 13 2018 Tomáš Mráz <tmraz@redhat.com> - 20180801-2.git2b95ede
+- Fix build to use the system python
 
-* Mon Jul 30 2018 Tomáš Mráz <tmraz@redhat.com> - 20180730-1.git9d9f21d
+* Wed Aug  1 2018 Tomáš Mráz <tmraz@redhat.com> - 20180801-1.git2b95ede
 - Add OpenSSL configuration file include support
+- Disable TLS-1.0, 1.1 and DH with less than 2048 bits in DEFAULT policy
 
 * Tue Jul 24 2018 Tomáš Mráz <tmraz@redhat.com> - 20180723-1.gitdb825c0
 - Initial FIPS mode setup support
@@ -531,23 +359,6 @@ end
 - Disable CAMELLIA
 - libreswan: Multiple bug fixes in policies
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180425-6.git6ad4018
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri May 18 2018 Björn Esser <besser82@fedoraproject.org> - 20180425-5.git6ad4018
-- Fix patch0
-
-* Fri May 18 2018 Björn Esser <besser82@fedoraproject.org> - 20180425-4.git6ad4018
-- Remove Requires: systemd
-- Add Patch to silence warnings from reload-cmds
-
-* Thu May 17 2018 Björn Esser <besser82@fedoraproject.org> - 20180425-3.git6ad4018
-- Requires: systemd should be added too
-
-* Thu May 17 2018 Björn Esser <besser82@fedoraproject.org> - 20180425-2.git6ad4018
-- Add Requires(post): systemd to fix:
-  crypto-policies/reload-cmds.sh: line 1: systemctl: command not found
-
 * Wed Apr 25 2018 Tomáš Mráz <tmraz@redhat.com> - 20180425-1.git6ad4018
 - Restart/reload only enabled services
 - Do not enable PSK ciphersuites by default in gnutls and openssl