diff --git a/libkcapi-use-external-fipshmac.patch b/libkcapi-use-external-fipshmac.patch new file mode 100644 index 0000000..9cca89c --- /dev/null +++ b/libkcapi-use-external-fipshmac.patch @@ -0,0 +1,44 @@ +Index: libkcapi-0.13.0/apps/Makefile +=================================================================== +--- libkcapi-0.13.0.orig/apps/Makefile ++++ libkcapi-0.13.0/apps/Makefile +@@ -65,27 +65,26 @@ install: + install -d ${DESTDIR}$(BINDIR)/ + install -m 0755 $(NAME) -D -t ${DESTDIR}$(BINDIR)/ + install -m 0755 sha1sum -D -t ${DESTDIR}$(BINDIR)/ +- ./fipshmac ${DESTDIR}$(BINDIR)/sha1sum ++ fipshmac ${DESTDIR}$(BINDIR)/sha1sum + install -m 0755 sha224sum -D -t ${DESTDIR}$(BINDIR)/ +- ./fipshmac ${DESTDIR}$(BINDIR)/sha224sum ++ fipshmac ${DESTDIR}$(BINDIR)/sha224sum + install -m 0755 sha256sum -D -t ${DESTDIR}$(BINDIR)/ +- ./fipshmac ${DESTDIR}$(BINDIR)/sha256sum ++ fipshmac ${DESTDIR}$(BINDIR)/sha256sum + install -m 0755 sha384sum -D -t ${DESTDIR}$(BINDIR)/ +- ./fipshmac ${DESTDIR}$(BINDIR)/sha384sum ++ fipshmac ${DESTDIR}$(BINDIR)/sha384sum + install -m 0755 sha512sum -D -t ${DESTDIR}$(BINDIR)/ +- ./fipshmac ${DESTDIR}$(BINDIR)/sha512sum ++ fipshmac ${DESTDIR}$(BINDIR)/sha512sum + install -m 0755 fipscheck -D -t ${DESTDIR}$(BINDIR)/ +- ./fipshmac ${DESTDIR}$(BINDIR)/fipscheck ++ fipshmac ${DESTDIR}$(BINDIR)/fipscheck + install -m 0755 fipshmac -D -t ${DESTDIR}$(BINDIR)/ +- ./fipshmac ${DESTDIR}$(BINDIR)/fipshmac ++ fipshmac ${DESTDIR}$(BINDIR)/fipshmac + install -m 0755 sha1hmac -D -t ${DESTDIR}$(BINDIR)/ +- ./sha512hmac sha1hmac > ${DESTDIR}$(BINDIR)/.sha1hmac.hmac ++ fipshmac ${DESTDIR}$(BINDIR)/sha1hmac + install -m 0755 sha224hmac -D -t ${DESTDIR}$(BINDIR)/ +- ./sha512hmac sha224hmac > ${DESTDIR}$(BINDIR)/.sha224hmac.hmac ++ fipshmac ${DESTDIR}$(BINDIR)/sha224hmac + install -m 0755 sha256hmac -D -t ${DESTDIR}$(BINDIR)/ +- ./sha512hmac sha256hmac > ${DESTDIR}$(BINDIR)/.sha256hmac.hmac ++ fipshmac ${DESTDIR}$(BINDIR)/sha256hmac + install -m 0755 sha384hmac -D -t ${DESTDIR}$(BINDIR)/ +- ./sha512hmac sha384hmac > ${DESTDIR}$(BINDIR)/.sha384hmac.hmac ++ fipshmac ${DESTDIR}$(BINDIR)/sha384hmac + install -m 0755 sha512hmac -D -t ${DESTDIR}$(BINDIR)/ +- ./sha512hmac sha512hmac > ${DESTDIR}$(BINDIR)/.sha512hmac.hmac +- ++ fipshmac ${DESTDIR}$(BINDIR)/sha512hmac diff --git a/libkcapi.changes b/libkcapi.changes index 80859f8..8744de4 100644 --- a/libkcapi.changes +++ b/libkcapi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 29 08:13:54 UTC 2017 - meissner@suse.com + +- libkcapi-use-external-fipshmac.patch: use external fipshmac, + our chroots / vm builds do not necessarily have the right kernel. + ------------------------------------------------------------------- Wed Jun 28 08:03:30 UTC 2017 - jengelh@inai.de diff --git a/libkcapi.spec b/libkcapi.spec index 111ca97..7266a85 100644 --- a/libkcapi.spec +++ b/libkcapi.spec @@ -25,9 +25,9 @@ Group: Productivity/Security Url: http://www.chronox.de/libkcapi.html #Source: https://github.com/smuellerDD/libkcapi/archive/v0.13.0.zip Source: libkcapi-0.13.0.tar.bz2 -# this ensures this kernel is booted actually... as the kernel crypto api is used during testing. -BuildRequires: kernel-default +Patch0: libkcapi-use-external-fipshmac.patch BuildRequires: docbook-utils xmlto +BuildRequires: fipscheck BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,6 +72,7 @@ libkcapi user space tools to access certain hash algorithms. %prep %setup -q +%patch0 -p1 %build cd lib