Attachment 606836 Details for Bug 851504 – Proposed patch for F17

[patch] Proposed patch for F17

F17-fix-fipscheck.patch (text/plain), 2.07 KB, created by Milan Broz on 2012-08-24 11:39:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Broz

Created: 2012-08-24 11:39:02 UTC

Size: 2.07 KB

patch

obsolete

>--- dracut-018.old/dracut-functions.sh	2012-08-24 13:33:55.000000000 +0200
>+++ dracut-018/dracut-functions.sh	2012-08-24 13:36:15.808528690 +0200
>@@ -406,6 +406,12 @@ inst_simple() {
>     if [[ -e "${_src%/*}/.${_src##*/}.hmac" ]]; then
>         inst "${_src%/*}/.${_src##*/}.hmac" "${target%/*}/.${target##*/}.hmac"
>     fi
>+    if [[ -e "/lib/fipscheck/${_src##*/}.hmac" ]]; then
>+        inst "/lib/fipscheck/${_src##*/}.hmac" "/lib/fipscheck/${target##*/}.hmac"
>+    fi
>+    if [[ -e "/lib64/fipscheck/${_src##*/}.hmac" ]]; then
>+        inst "/lib64/fipscheck/${_src##*/}.hmac" "/lib64/fipscheck/${target##*/}.hmac"
>+    fi
>     ddebug "Installing $_src"
>     cp --sparse=always -pfL "$_src" "${initdir}/$target"
> }
>@@ -447,6 +453,12 @@ inst_library() {
>         if [[ -e "${_src%/*}/.${_src##*/}.hmac" ]]; then
>             inst "${_src%/*}/.${_src##*/}.hmac" "${_dest%/*}/.${_dest##*/}.hmac"
>         fi
>+        if [[ -e "/lib/fipscheck/${_src##*/}.hmac" ]]; then
>+            inst "/lib/fipscheck/${_src##*/}.hmac" "/lib/fipscheck/${_dest##*/}.hmac"
>+        fi
>+        if [[ -e "/lib64/fipscheck/${_src##*/}.hmac" ]]; then
>+            inst "/lib64/fipscheck/${_src##*/}.hmac" "/lib64/fipscheck/${_dest##*/}.hmac"
>+        fi
>         _reallib=$(readlink -f "$_src")
>         inst_simple "$_reallib" "$_reallib"
>         inst_dir "${_dest%/*}"
>--- dracut-018.old/modules.d/01fips/module-setup.sh	2012-08-24 13:33:55.000000000 +0200
>+++ dracut-018/modules.d/01fips/module-setup.sh	2012-08-24 13:36:42.898791224 +0200
>@@ -32,13 +32,14 @@ install() {
>     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
>     inst "$moddir/fips.sh" /sbin/fips.sh
> 
>-    dracut_install sha512hmac rmmod insmod mount uname umount
>+    dracut_install sha512hmac rmmod insmod mount uname umount fipscheck
> 
>     inst_libdir_file libsoftokn3.so
>     inst_libdir_file libsoftokn3.so
>     inst_libdir_file libsoftokn3.chk
>     inst_libdir_file libfreebl3.so
>     inst_libdir_file libfreebl3.chk
>+    inst_libdir_file libssl.so.10
> 
>     dracut_install $usrlibdir/hmaccalc/sha512hmac.hmac
>     if command -v prelink >/dev/null; then

Actions: View | Diff

Attachments on bug 851504: 606836