|
 |
b104ef8 |
From 025eb8aea94761fdc45507b6192aafdef80d4842 Mon Sep 17 00:00:00 2001
|
|
|
b104ef8 |
From: Peter Jones <pjones@redhat.com>
|
|
|
b104ef8 |
Date: Wed, 9 Aug 2017 17:31:31 -0400
|
|
|
b104ef8 |
Subject: [PATCH 28/28] rpm: Make the client signer use the fedora values
|
|
|
b104ef8 |
unless overridden
|
|
|
b104ef8 |
|
|
|
b104ef8 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
b104ef8 |
---
|
|
|
b104ef8 |
src/macros.pesign | 9 ++++++---
|
|
|
b104ef8 |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
b104ef8 |
|
|
|
b104ef8 |
diff --git a/src/macros.pesign b/src/macros.pesign
|
|
|
b104ef8 |
index 69280e9..22a3ee6 100644
|
|
|
b104ef8 |
--- a/src/macros.pesign
|
|
|
b104ef8 |
+++ b/src/macros.pesign
|
|
|
b104ef8 |
@@ -9,6 +9,9 @@
|
|
|
b104ef8 |
%__pesign_token %{nil}%{?pe_signing_token:-t "%{pe_signing_token}"}
|
|
|
b104ef8 |
%__pesign_cert %{!?pe_signing_cert:"Red Hat Test Certificate"}%{?pe_signing_cert:"%{pe_signing_cert}"}
|
|
|
b104ef8 |
|
|
|
b104ef8 |
+%__pesign_client_token %{!?pe_signing_token:"Fedora Signer (OpenSC Card)"}%{?pe_signing_token:"%{pe_signing_token}}
|
|
|
b104ef8 |
+%__pesign_client_cert %{!?pe_signing_cert:"/CN=Fedora Secure Boot Signer"}%{?pe_signing_cert:"%{pe_signing_cert}}
|
|
|
b104ef8 |
+
|
|
|
b104ef8 |
%_pesign /usr/bin/pesign
|
|
|
b104ef8 |
%_pesign_client /usr/bin/pesign-client
|
|
|
b104ef8 |
|
|
|
b104ef8 |
@@ -41,11 +44,11 @@
|
|
|
b104ef8 |
--certdir ${nss} -c signer %{-o} \
|
|
|
b104ef8 |
rm -rf ${sattrs} ${sattrs}.sig ${nss} \
|
|
|
b104ef8 |
elif [ -S /var/run/pesign/socket ]; then \
|
|
|
b104ef8 |
- %{_pesign_client} -t %{__pesign_token} \\\
|
|
|
b104ef8 |
- -c %{__pesign_cert} \\\
|
|
|
b104ef8 |
+ %{_pesign_client} -t %{__pesign_client_token} \\\
|
|
|
b104ef8 |
+ -c %{__pesign_client_cert} \\\
|
|
|
b104ef8 |
%{-i} %{-o} %{-e} %{-s} %{-C} \
|
|
|
b104ef8 |
else \
|
|
|
b104ef8 |
- %{_pesign} -t %{__pesign_token} -c %{__pesign_cert} \\\
|
|
|
b104ef8 |
+ %{_pesign} %{__pesign_token} -c %{__pesign_cert} \\\
|
|
|
b104ef8 |
--certdir ${_pesign_nssdir} \\\
|
|
|
b104ef8 |
%{-i} %{-o} %{-e} %{-s} %{-C} \
|
|
|
b104ef8 |
fi \
|
|
|
b104ef8 |
--
|
|
|
b104ef8 |
2.13.4
|
|
|
b104ef8 |
|