Attachment 606673 Details for Bug 851185 – Proposed workaround for dracut-install

[patch] Proposed workaround for dracut-install

0001-dracut-install-FIPS-workaround-for-fipscheck-dir.patch (text/plain), 2.78 KB, created by Milan Broz on 2012-08-23 17:58:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Broz

Created: 2012-08-23 17:58:05 UTC

Size: 2.78 KB

patch

obsolete

>From df7a1e42346379ca442c78ca61586c17255ff129 Mon Sep 17 00:00:00 2001
>From: Milan Broz <mbroz@redhat.com>
>Date: Thu, 23 Aug 2012 19:47:03 +0200
>Subject: [PATCH 1/2] dracut-install: FIPS workaround for fipscheck dir
>
>In recent Fedora distro are all hmac files located in /lib
>(to avoid multiarch conflict).
>
>When installing hmac file, also install files from these locations.
>
>Signed-off-by: Milan Broz <mbroz@redhat.com>
>---
> install/dracut-install.c |   20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/install/dracut-install.c b/install/dracut-install.c
>index 0571c2a..f06f5ac 100644
>--- a/install/dracut-install.c
>+++ b/install/dracut-install.c
>@@ -321,7 +321,7 @@ static int resolve_deps(const char *src)
> }
> 
> /* Install ".<filename>.hmac" file for FIPS self-checks */
>-static int hmac_install(const char *src, const char *dst)
>+static int hmac_install(const char *src, const char *dst, const char *hmacpath)
> {
>         char *srcpath = strdup(src);
>         char *dstpath = strdup(dst);
>@@ -332,10 +332,20 @@ static int hmac_install(const char *src, const char *dst)
>         if (endswith(src, ".hmac"))
>                 return 0;
> 
>+	if (!hmacpath) {
>+                hmac_install(src, dst, "/lib/fipscheck");
>+                hmac_install(src, dst, "/lib64/fipscheck");
>+        }
>+
>         srcpath[dlen] = '\0';
>         dstpath[dir_len(dst)] = '\0';
>-        asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
>-        asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
>+        if (hmacpath) {
>+                asprintf(&srchmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
>+                asprintf(&dsthmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
>+        } else {
>+                asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
>+                asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
>+        }
>         log_debug("hmac cp '%s' '%s')", srchmacname, dsthmacname);
>         dracut_install(srchmacname, dsthmacname, false, false, true);
>         free(dsthmacname);
>@@ -480,7 +490,7 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
>                 free(abspath);
>                 if (arg_hmac) {
>                         /* copy .hmac files also */
>-                        hmac_install(src, dst);
>+                        hmac_install(src, dst, NULL);
>                 }
> 
>                 return 0;
>@@ -491,7 +501,7 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
>                         ret += resolve_deps(src);
>                 if (arg_hmac) {
>                         /* copy .hmac files also */
>-                        hmac_install(src, dst);
>+                        hmac_install(src, dst, NULL);
>                 }
>         }
> 
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 851185: 606558 | 606673 | 606674