forked from pool/crypto-policies
Accepting request 921687 from security:tls
OBS-URL: https://build.opensuse.org/request/show/921687 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/crypto-policies?expand=0&rev=2factory
Dominique Leuenberger
2 years ago
committed by
Git OBS Bridge
commit
deb77ad9ac
@ -1,2 +1,2 @@
|
||||
Currently only OpenSSL, GnuTLS, and NSS policies are supported.
|
||||
Currently only OpenSSL and GnuTLS policies are supported.
|
||||
The rest of the modules ignore the policy settings for the time being.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://gitlab.com/redhat-crypto/fedora-crypto-policies.git</param>
|
||||
<param name="changesrevision">05203d21f6d0ea9bbdb351e4600f1e273720bb8e</param></service></servicedata>
|
||||
<param name="changesrevision">c9d86d1154c4b286c9be3d5e9e32451df6f64e19</param></service></servicedata>
|
||||
@ -0,0 +1,72 @@
|
||||
Index: fedora-crypto-policies/Makefile
|
||||
===================================================================
|
||||
--- fedora-crypto-policies.orig/Makefile
|
||||
+++ fedora-crypto-policies/Makefile
|
||||
@@ -5,8 +5,8 @@ MANDIR?=/usr/share/man
|
||||
CONFDIR?=/etc/crypto-policies
|
||||
DESTDIR?=
|
||||
MAN7PAGES=crypto-policies.7
|
||||
-MAN8PAGES=update-crypto-policies.8 fips-finish-install.8 fips-mode-setup.8
|
||||
-SCRIPTS=update-crypto-policies fips-finish-install fips-mode-setup
|
||||
+MAN8PAGES=update-crypto-policies.8 fips-finish-install.8
|
||||
+SCRIPTS=update-crypto-policies fips-finish-install
|
||||
NUM_PROCS = $$(getconf _NPROCESSORS_ONLN)
|
||||
PYVERSION = -3
|
||||
DIFFTOOL?=meld
|
||||
Index: fedora-crypto-policies/crypto-policies.7.txt
|
||||
===================================================================
|
||||
--- fedora-crypto-policies.orig/crypto-policies.7.txt
|
||||
+++ fedora-crypto-policies/crypto-policies.7.txt
|
||||
@@ -144,9 +144,6 @@ PROVIDED POLICIES
|
||||
|
||||
*FIPS*::
|
||||
A policy to aid conformance to the *FIPS 140-2* requirements.
|
||||
- This policy is used internally by the *fips-mode-setup(8)* tool
|
||||
- which can switch the system into the *FIPS 140-2* mode.
|
||||
- This policy provides at least 112-bit security.
|
||||
|
||||
* MACs: all *HMAC* with *SHA1* or better
|
||||
* Curves: all prime >= 256 bits
|
||||
@@ -255,12 +252,6 @@ COMMANDS
|
||||
back ends and allows the system administrator to change the active
|
||||
cryptographic policy.
|
||||
|
||||
-*fips-mode-setup(8)*::
|
||||
- This command allows the system administrator to enable, or disable the
|
||||
- system FIPS mode and also apply the *FIPS* cryptographic policy
|
||||
- which limits the allowed algorithms and protocols to these allowed by
|
||||
- the FIPS 140-2 requirements.
|
||||
-
|
||||
|
||||
NOTES
|
||||
-----
|
||||
@@ -427,7 +418,7 @@ FILES
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
-update-crypto-policies(8), fips-mode-setup(8)
|
||||
+update-crypto-policies(8)
|
||||
|
||||
|
||||
AUTHOR
|
||||
Index: fedora-crypto-policies/python/update-crypto-policies.py
|
||||
===================================================================
|
||||
--- fedora-crypto-policies.orig/python/update-crypto-policies.py
|
||||
+++ fedora-crypto-policies/python/update-crypto-policies.py
|
||||
@@ -344,16 +344,12 @@ def apply_policy(pconfig, profile=None,
|
||||
eprint("Warning: Using 'update-crypto-policies --set FIPS' "
|
||||
"is not sufficient for")
|
||||
eprint(" FIPS compliance.")
|
||||
- eprint(" Use 'fips-mode-setup --enable' "
|
||||
- "command instead.")
|
||||
elif fips_mode():
|
||||
eprint("Warning: Using 'update-crypto-policies --set' "
|
||||
"in FIPS mode will make the system")
|
||||
eprint(" non-compliant with FIPS.")
|
||||
eprint(" It can also break "
|
||||
"the ssh access to the system.")
|
||||
- eprint(" Use 'fips-mode-setup --disable' "
|
||||
- "to disable the system FIPS mode.")
|
||||
|
||||
if base_dir == DEFAULT_BASE_DIR:
|
||||
if not os.geteuid() == 0:
|
||||
@ -1,15 +0,0 @@
|
||||
Index: fedora-crypto-policies-master/Makefile
|
||||
===================================================================
|
||||
--- fedora-crypto-policies-master.orig/Makefile 2020-09-23 08:49:28.000000000 +0200
|
||||
+++ fedora-crypto-policies-master/Makefile 2020-11-12 10:00:52.418204054 +0100
|
||||
@@ -60,8 +60,8 @@ clean:
|
||||
rm -rf output
|
||||
|
||||
%: %.txt
|
||||
- asciidoc.py -v -d manpage -b docbook $<
|
||||
- xsltproc --nonet -o $@ /usr/share/asciidoc/docbook-xsl/manpage.xsl $@.xml
|
||||
+ asciidoc -v -d manpage -b docbook $<
|
||||
+ xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml
|
||||
|
||||
dist:
|
||||
rm -rf crypto-policies && git clone . crypto-policies && rm -rf crypto-policies/.git/ && tar -czf crypto-policies-git$(VERSION).tar.gz crypto-policies && rm -rf crypto-policies
|
||||
@ -1,48 +0,0 @@
|
||||
From: Hideki Yamane <h-yamane@sios.com>
|
||||
Date: Sun, 25 Aug 2019 04:08:35 +0900
|
||||
Subject: fix typos
|
||||
|
||||
---
|
||||
crypto-policies.7.txt | 2 +-
|
||||
fips-finish-install | 2 +-
|
||||
fips-finish-install.8.txt | 2 +-
|
||||
|
||||
Index: fedora-crypto-policies-master/crypto-policies.7.txt
|
||||
===================================================================
|
||||
--- fedora-crypto-policies-master.orig/crypto-policies.7.txt
|
||||
+++ fedora-crypto-policies-master/crypto-policies.7.txt
|
||||
@@ -236,7 +236,7 @@ To completely override a list value in a
|
||||
sign. Combining 'list-items' with and without signs in a single list value assignment is
|
||||
not allowed however an existing list value can be modified in multiple further assignments.
|
||||
|
||||
-Non-list key values in the policy module files are simply overriden.
|
||||
+Non-list key values in the policy module files are simply overridden.
|
||||
|
||||
The keys marked as *Optional* can be omitted in the policy definition
|
||||
files. In that case, the values will be derived from the base
|
||||
Index: fedora-crypto-policies-master/fips-finish-install
|
||||
===================================================================
|
||||
--- fedora-crypto-policies-master.orig/fips-finish-install
|
||||
+++ fedora-crypto-policies-master/fips-finish-install
|
||||
@@ -12,7 +12,7 @@ if test -f /run/ostree-booted; then
|
||||
fi
|
||||
|
||||
if test x"$1" != x--complete ; then
|
||||
- echo "Complete the instalation of FIPS modules."
|
||||
+ echo "Complete the installation of FIPS modules."
|
||||
echo "usage: $0 --complete"
|
||||
exit 2
|
||||
fi
|
||||
Index: fedora-crypto-policies-master/fips-finish-install.8.txt
|
||||
===================================================================
|
||||
--- fedora-crypto-policies-master.orig/fips-finish-install.8.txt
|
||||
+++ fedora-crypto-policies-master/fips-finish-install.8.txt
|
||||
@@ -21,7 +21,7 @@ fips-finish-install(8)
|
||||
|
||||
NAME
|
||||
----
|
||||
-fips-finish-install - complete the instalation of FIPS modules.
|
||||
+fips-finish-install - complete the installation of FIPS modules.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:773522be2bf98a7e88bc684d33c846b337d170cf33001dc2b20eee35c82c8030
|
||||
size 58094
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d5e57503a00c247d549aab27de2a3d96c7d8756910939aec5acd38df6e73c252
|
||||
size 75022
|
||||
Loading…
Reference in New Issue