Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VI5wU-0000rp-Vi for mharc-grub-devel@gnu.org; Fri, 06 Sep 2013 19:59:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VI5wS-0000ov-4S for grub-devel@gnu.org; Fri, 06 Sep 2013 19:59:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VI5wQ-0002lr-VW for grub-devel@gnu.org; Fri, 06 Sep 2013 19:59:56 -0400 Received: from mail-yh0-x249.google.com ([2607:f8b0:4002:c01::249]:41698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VI5wQ-0002ln-QO for grub-devel@gnu.org; Fri, 06 Sep 2013 19:59:54 -0400 Received: by mail-yh0-f73.google.com with SMTP id z20so379482yhz.4 for ; Fri, 06 Sep 2013 16:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lDTHmdF3BAoxbKZdGDoj/pZl8SoNCaXveNSrygJRP8k=; b=VvS/CI2ZfCGbKqidO+1vnvOTHLJR6A+Mu7YQnvBEtQFIO3B9Vfp6U0IW8wfMVIZWT5 h4T+8u+q+krF+02oUAArsDczqO+4SCCDDIRxxupAgaWCyQx8GVVTwE5Z1F9vondKH9h4 1WVRdBfXoUJSoWhiIjVaYZbsT/2dxaFI3t4FqOmp10DKaLk50xQ5CSZY/l/Wdmk5v1cu lcJ9vNHCv7Y+6Hphvo1gRg/PPNIHHkYdy1njibk4SpM65kvkqYbdmWfO/UNWnMQ+9AZa SZzIV3dJl57oNrpNSDyxxihnxi7ZDAqCidlouJnTlaiC8IpfsV1oY1b0TThfceYnZqvU qwxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lDTHmdF3BAoxbKZdGDoj/pZl8SoNCaXveNSrygJRP8k=; b=czf93xHrkhYTPUS+keWW1FHN1NNsSxuPY+eAg/Z72F8hsDw+zRYc1y+eYqeBIm9VXS 2rVM46q6p9X3rL69wG/ACC9wWjmwnN+v5ozjwBPy3VRajDbtz6w1treggN3HeqS6Am7k XMkkS6i8PR4aTLsjKb12P67B8l5HFs4rCUmKUwzealixpwcyxrbj5Qk/j3NdxgNM9PJ4 LXwl1SECqP4yIkvRrZbzwftfIeEVlUuCcOpnJ3knvIE7OdlubRmisUFQVwnrlP4u5P6h hJDJX+XSqXARQRsAETUwJT2cXM+DekJ8B35cLeekJlmW3XhgEvrmmv4ITY8HSfDrgU5j fVcw== X-Gm-Message-State: ALoCoQnqU4neo+op1Dpj3AVsNNgYsbH6Md/feYYJVosYQN34ffNe5SIBKcL+WaXr0pnrb5ZJE31z+BuiRnFo79aFVgSCtYvQYZn9igC6GDSv1hy6mmlh2KUwhzgY9eB8/hhM4ezb1NFE5FupBcpxdXRCAQVEbVIuDYMPiujt7QnARoJH5Qy/aPbBAZti8rGBCXYm5fp132IiD9nJpKGUSjokjPVHaKxi6dw3GaeMb2KIh5hYZIdKH20= X-Received: by 10.236.56.70 with SMTP id l46mr1797008yhc.2.1378511994318; Fri, 06 Sep 2013 16:59:54 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id z45si18069yha.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Fri, 06 Sep 2013 16:59:54 -0700 (PDT) Received: from yinz.mtv.corp.google.com (yinz.mtv.corp.google.com [172.17.81.122]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 128CB5A41A3; Fri, 6 Sep 2013 16:59:54 -0700 (PDT) Received: by yinz.mtv.corp.google.com (Postfix, from userid 184367) id C6E4EC0763; Fri, 6 Sep 2013 16:59:53 -0700 (PDT) From: Jon McCune To: grub-devel@gnu.org Subject: [PATCH v3 3/3] Add (multiple) -k, --pubkey=FILE support to grub-install command Date: Fri, 6 Sep 2013 16:59:18 -0700 Message-Id: <1378511958-19974-4-git-send-email-jonmccune@google.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1378511958-19974-1-git-send-email-jonmccune@google.com> References: <1378511958-19974-1-git-send-email-jonmccune@google.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c01::249 Cc: Jon McCune X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Sep 2013 23:59:57 -0000 Passes along one or more public keys to the grub-mkimage invocation Signed-off-by: Jon McCune --- util/grub-install.in | 19 +++++++++++++++---- util/grub-install_header | 6 ++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/util/grub-install.in b/util/grub-install.in index 1816bb1..034cf10 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -650,10 +650,21 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in *) imgext=img ;; esac +pubkey_file_arg="" +if [ x"$pubkey_file_list" != x ]; then + for file in $pubkey_file_list; do + if [ ! -e "$file" ]; then + gettext_printf "Public key file %s not found.\n" "${file}" 1>&2 + exit 1 + fi + pubkey_file_arg="$pubkey_file_arg --pubkey=$file" + done +fi + if [ x"$config_opt_file" = x ]; then - "$grub_mkimage" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" $pubkey_file_arg -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 else - "$grub_mkimage" -c "${config_opt_file}" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" -c "${config_opt_file}" $pubkey_file_arg -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 fi # Backward-compatibility kludges @@ -664,9 +675,9 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-efi" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "x86_64-efi" ]; then if [ x"$config_opt_file" = x ]; then - "$grub_mkimage" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" $pubkey_file_arg -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 else - "$grub_mkimage" -c "${config_opt_file}" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" -c "${config_opt_file}" $pubkey_file_arg -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 fi fi diff --git a/util/grub-install_header b/util/grub-install_header index cf7fa9d..5ea27d6 100644 --- a/util/grub-install_header +++ b/util/grub-install_header @@ -156,6 +156,7 @@ grub_print_install_files_help () { dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/]" "${libdir}/@PACKAGE@")" print_option_help "-d, --directory=$(gettext "DIR")" "$dir_msg" print_option_help "--grub-mkimage=$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")" + print_option_help "-k, --pubkey=$(gettext "FILE")" "$(gettext "embed FILE as public key for signature checking")" print_option_help "-v, --version" "$(gettext "print the version information and exit")" } @@ -168,6 +169,7 @@ grub_decompression_module="" compressor="" compressor_opts="" source_directory="" +pubkey_file_list="" argument () { opt=$1 @@ -245,6 +247,10 @@ grub_process_install_options () { grub_mkimage=`argument $option "$@"`; grub_process_install_options_consumed=2 ;; --grub-mkimage=*) grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'`;grub_process_install_options_consumed=1 ;; + --pubkey | -k) + pubkey_file_list=`echo -n "$pubkey_file_list "; argument $option "$@"`; grub_process_install_options_consumed=2;; + --pubkey=*) + pubkey_file_list=`echo -n "$pubkey_file_list "; echo "$option" | sed 's/--pubkey=//'` grub_process_install_options_consumed=1;; --modules) modules=`argument $option "$@"`; grub_process_install_options_consumed=2;; --modules=*) -- 1.8.4