Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-crypt/tpm2-openssl/
Date: Wed, 28 Sep 2022 16:05:06
Message-Id: 1664379953.ce5b974bb8de3f14c9902669998e6ad8eb8901cb.tastytea@gentoo
1 commit: ce5b974bb8de3f14c9902669998e6ad8eb8901cb
2 Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 28 15:45:53 2022 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Wed Sep 28 15:45:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ce5b974b
7
8 app-crypt/tpm2-openssl: Add missing quoting
9
10 Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
11
12 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 18 +++++++++---------
13 1 file changed, 9 insertions(+), 9 deletions(-)
14
15 diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
16 index 2cb119589..7ac127f02 100644
17 --- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
18 +++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
19 @@ -43,13 +43,13 @@ dbus_run() {
20 }
21
22 tpm2_run_with_emulator() {
23 - export XDG_CONFIG_HOME=${T}/.config/swtpm
24 + export XDG_CONFIG_HOME="${T}/.config/swtpm"
25 "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
26
27 - mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
28 + mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die
29 swtpm_setup_args=(
30 --tpm2
31 - --tpmstate ${XDG_CONFIG_HOME}/mytpm1
32 + --tpmstate "${XDG_CONFIG_HOME}/mytpm1"
33 --createek
34 --allow-signing
35 --decryption
36 @@ -63,18 +63,18 @@ tpm2_run_with_emulator() {
37
38 swtpm_socket_args=(
39 --tpm2
40 - --tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
41 + --tpmstate dir="${XDG_CONFIG_HOME}/mytpm1"
42 --flags startup-clear
43 - --ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
44 - --server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
45 - --pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
46 + --ctrl type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl"
47 + --server type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
48 + --pid file="${XDG_CONFIG_HOME}/mytpm1/swtpm.pid"
49 --daemon
50 )
51 swtpm socket "${swtpm_socket_args[@]}" || die
52
53 tpm2_abrmd_args=(
54 --logger=stdout
55 - --tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
56 + --tcti=swtpm:path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
57 --session
58 --flush-all
59 )
60 @@ -86,7 +86,7 @@ tpm2_run_with_emulator() {
61 $@ || die
62
63 # When swtpm dies, tmp2-abrmd will exit
64 - kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
65 + kill $(< "${XDG_CONFIG_HOME}/mytpm1/swtpm.pid") || die
66 }
67
68 src_prepare() {