From d618de733865eab359890b4e677c368a133dad99 Mon Sep 17 00:00:00 2001

From: Pat Riehecky <riehecky@fnal.gov>

Date: Mon, 7 Nov 2016 11:37:08 -0600

Subject: [PATCH 07/29] Switch pesign client to also accept token/cert macros

 rather than use hard coded values

---

 src/macros.pesign | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/macros.pesign b/src/macros.pesign

index 18e5b5e..69280e9 100644

--- a/src/macros.pesign

+++ b/src/macros.pesign

@@ -41,11 +41,11 @@

                  --certdir ${nss} -c signer %{-o}			\

       rm -rf ${sattrs} ${sattrs}.sig ${nss}				\

     elif [ -S /var/run/pesign/socket ]; then				\

-      %{_pesign_client} -t "OpenSC Card (Fedora Signer)"		\\\

-                        -c "/CN=Fedora Secure Boot Signer"		\\\

+      %{_pesign_client} -t %{__pesign_token}				\\\

+                        -c %{__pesign_cert}				\\\

                         %{-i} %{-o} %{-e} %{-s} %{-C}			\

     else								\

-      %{_pesign} %{__pesign_token} -c %{__pesign_cert}			\\\

+      %{_pesign} -t %{__pesign_token} -c %{__pesign_cert}		\\\

 		 --certdir ${_pesign_nssdir}				\\\

                  %{-i} %{-o} %{-e} %{-s} %{-C}				\

     fi									\

-- 

2.13.4