Merge ~jocave/plainbox-provider-tpm2:move-to-roots-home into plainbox-provider-tpm2:master
- Git
- lp:~jocave/plainbox-provider-tpm2
- move-to-roots-home
- Merge into master
Status: | Merged |
---|---|
Approved by: | Sylvain Pineau |
Approved revision: | 613fce98038e4ff29a1f1c6554eff8da18f8d24f |
Merged at revision: | 0051b65e97bc4910913ad7b4976f76222259f6bd |
Proposed branch: | ~jocave/plainbox-provider-tpm2:move-to-roots-home |
Merge into: | plainbox-provider-tpm2:master |
Diff against target: |
879 lines (+167/-142) 25 files modified
bin/test_tpm2_activecredential.sh (+10/-10) bin/test_tpm2_akparse.sh (+2/-2) bin/test_tpm2_certify.sh (+7/-7) bin/test_tpm2_create_all.sh (+5/-5) bin/test_tpm2_createprimary_all.sh (+3/-3) bin/test_tpm2_encryptdecrypt.sh (+9/-9) bin/test_tpm2_evictcontrol.sh (+5/-5) bin/test_tpm2_getpubak.sh (+3/-3) bin/test_tpm2_getpubek.sh (+1/-1) bin/test_tpm2_getrandom.sh (+2/-2) bin/test_tpm2_getrandom_func.sh (+2/-2) bin/test_tpm2_hash.sh (+4/-4) bin/test_tpm2_hmac.sh (+10/-10) bin/test_tpm2_listpcrs.sh (+2/-2) bin/test_tpm2_load.sh (+7/-7) bin/test_tpm2_loadexternal.sh (+7/-7) bin/test_tpm2_makecredential.sh (+9/-9) bin/test_tpm2_nv.sh (+2/-2) bin/test_tpm2_readpublic.sh (+7/-7) bin/test_tpm2_rsadecrypt.sh (+9/-9) bin/test_tpm2_rsaencrypt.sh (+7/-7) bin/test_tpm2_sign.sh (+10/-10) bin/test_tpm2_unseal.sh (+7/-7) bin/test_tpm2_verifysignature.sh (+12/-12) units/tpm2_1.1.pxu (+25/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devices Certification Bot | Needs Fixing | ||
Sylvain Pineau (community) | Approve | ||
Jonathan Cave (community) | Needs Resubmitting | ||
Review via email:
|
Commit message
Description of the change
We need a quick solution for tpm2 tests to pass now that checkbox is running as a service as root. This is quickest (and dirtiest) solution I think we have.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jonathan Cave (jocave) wrote : | # |
Modifed the tpm2_1.1 jobs to ensure run as root.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Sylvain Pineau (sylvain-pineau) wrote : | # |
"Don't push the red button!"
I did
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Devices Certification Bot (ce-certification-qa) wrote : | # |
The merge was fine but running tests failed.
[trusty] [07:51:28] starting container
Device project added to trusty-testing
[xenial] [07:51:33] starting container
[xenial] [07:51:34] Unable to start ephemeral container!
[xenial] output: https:/
[xenial] NOTE: unable to execute tests, marked as failed
[xenial] Destroying failed container to reclaim resources
[bionic] [07:51:48] starting container
[bionic] [07:51:49] Unable to start ephemeral container!
[trusty] [07:51:50] provisioning container
[bionic] output: https:/
[bionic] NOTE: unable to execute tests, marked as failed
[bionic] Destroying failed container to reclaim resources
[trusty] [07:53:17] Starting tests...
[trusty] Found a test script: ./requirements/
[trusty] [07:54:47] container-
[trusty] [07:54:47] Fixing file permissions in source directory
[trusty] [07:54:47] Destroying container
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Devices Certification Bot (ce-certification-qa) wrote : | # |
The merge was fine but running tests failed.
[xenial] [10:10:54] starting container
[xenial] [10:10:55] Unable to start ephemeral container!
[bionic] [10:10:56] starting container
[bionic] [10:10:57] Unable to start ephemeral container!
[xenial] output: https:/
[xenial] NOTE: unable to execute tests, marked as failed
[xenial] Destroying failed container to reclaim resources
[bionic] output: https:/
[bionic] NOTE: unable to execute tests, marked as failed
[bionic] Destroying failed container to reclaim resources
[trusty] [10:11:14] starting container
Device project added to trusty-testing
[trusty] [10:11:25] provisioning container
[trusty] [10:12:42] Starting tests...
[trusty] Found a test script: ./requirements/
[trusty] [10:13:26] container-
[trusty] [10:13:26] Fixing file permissions in source directory
[trusty] [10:13:26] Destroying container
Preview Diff
1 | diff --git a/bin/test_tpm2_activecredential.sh b/bin/test_tpm2_activecredential.sh |
2 | index 01d31b6..a2f67c7 100755 |
3 | --- a/bin/test_tpm2_activecredential.sh |
4 | +++ b/bin/test_tpm2_activecredential.sh |
5 | @@ -37,12 +37,12 @@ ak_alg=0x0001 |
6 | digestAlg=0x000B |
7 | signAlg=0x0014 |
8 | |
9 | -file_input_data=/home/$USER/secret.data |
10 | -output_ek_pub=/home/$USER/ek_pub.out |
11 | -output_ak_pub=/home/$USER/ak_pub.out |
12 | -output_ak_pub_name=/home/$USER/ak_name_pub.out |
13 | -output_mkcredential=/home/$USER/mkcredential.out |
14 | -output_actcredential=/home/$USER/actcredential.out |
15 | +file_input_data=/root/secret.data |
16 | +output_ek_pub=/root/ek_pub.out |
17 | +output_ak_pub=/root/ak_pub.out |
18 | +output_ak_pub_name=/root/ak_name_pub.out |
19 | +output_mkcredential=/root/mkcredential.out |
20 | +output_actcredential=/root/actcredential.out |
21 | |
22 | fail() |
23 | { |
24 | @@ -62,12 +62,12 @@ if [ $? != 0 ] || [ ! -e $output_ek_pub ];then |
25 | fail getpubek |
26 | fi |
27 | |
28 | -tpm2_getpubak -E $handle_ek -k $handle_ak -g $ak_alg -D $digestAlg -s $signAlg -f $output_ak_pub -n $output_ak_pub_name |tee /home/$USER/output_ak |
29 | -if [ $? != 0 ] || [ ! -e /home/$USER/output_ak ];then |
30 | +tpm2_getpubak -E $handle_ek -k $handle_ak -g $ak_alg -D $digestAlg -s $signAlg -f $output_ak_pub -n $output_ak_pub_name |tee /root/output_ak |
31 | +if [ $? != 0 ] || [ ! -e /root/output_ak ];then |
32 | fail getpubak |
33 | fi |
34 | -grep -A 3 "Name of loaded key:" /home/$USER/output_ak|tr "\n" " " >/home/$USER/grep.txt |
35 | -Loadkeyname=`sed -e 's/ //g' /home/$USER/grep.txt | awk -F':' '{print $2}'` |
36 | +grep -A 3 "Name of loaded key:" /root/output_ak|tr "\n" " " >/root/grep.txt |
37 | +Loadkeyname=`sed -e 's/ //g' /root/grep.txt | awk -F':' '{print $2}'` |
38 | |
39 | tpm2_makecredential -e $output_ek_pub -s $file_input_data -n $Loadkeyname -o $output_mkcredential |
40 | if [ $? != 0 ];then |
41 | diff --git a/bin/test_tpm2_akparse.sh b/bin/test_tpm2_akparse.sh |
42 | index 40785f0..ff00ae5 100755 |
43 | --- a/bin/test_tpm2_akparse.sh |
44 | +++ b/bin/test_tpm2_akparse.sh |
45 | @@ -34,8 +34,8 @@ |
46 | new_path=`dirname $0` |
47 | PATH="$PATH":"$new_path" |
48 | |
49 | -file_input_data=/home/$USER/ak_pub.out |
50 | -output_akparse=/home/$USER/akparse.out |
51 | +file_input_data=/root/ak_pub.out |
52 | +output_akparse=/root/akparse.out |
53 | |
54 | rm $output_ekparse -rf |
55 | |
56 | diff --git a/bin/test_tpm2_certify.sh b/bin/test_tpm2_certify.sh |
57 | index 56e23a6..dd1e17d 100755 |
58 | --- a/bin/test_tpm2_certify.sh |
59 | +++ b/bin/test_tpm2_certify.sh |
60 | @@ -30,13 +30,13 @@ |
61 | # THE POSSIBILITY OF SUCH DAMAGE. |
62 | #;**********************************************************************; |
63 | #!/bin/bash |
64 | -file_primary_key_ctx=/home/$USER/context.p_B1 |
65 | -file_certify_key_pub=/home/$USER/opuB1_B8 |
66 | -file_certify_key_priv=/home/$USER/oprB1_B8 |
67 | -file_certify_key_ctx=/home/$USER/context_load_out_B1_B8 |
68 | -file_certify_key_name=/home/$USER/name.load.B1_B8 |
69 | -file_output_attest=/home/$USER/attest.out |
70 | -file_output_signature=/home/$USER/certify_signature.out |
71 | +file_primary_key_ctx=/root/context.p_B1 |
72 | +file_certify_key_pub=/root/opuB1_B8 |
73 | +file_certify_key_priv=/root/oprB1_B8 |
74 | +file_certify_key_ctx=/root/context_load_out_B1_B8 |
75 | +file_certify_key_name=/root/name.load.B1_B8 |
76 | +file_output_attest=/root/attest.out |
77 | +file_output_signature=/root/certify_signature.out |
78 | |
79 | |
80 | alg_hash=0x000B |
81 | diff --git a/bin/test_tpm2_create_all.sh b/bin/test_tpm2_create_all.sh |
82 | index 7664c70..81056a3 100755 |
83 | --- a/bin/test_tpm2_create_all.sh |
84 | +++ b/bin/test_tpm2_create_all.sh |
85 | @@ -39,9 +39,9 @@ GAlg= |
86 | gAlgList="0x04 0x0B" |
87 | STATUS=0 |
88 | |
89 | -rm -f /home/$USER/create.error.log /home/$USER/opr* /home/$USER/opu* |
90 | +rm -f /root/create.error.log /root/opr* /root/opu* |
91 | |
92 | -ctx_count=`ls /home/$USER/ | grep -c ^ctx.cpri` |
93 | +ctx_count=`ls /root/ | grep -c ^ctx.cpri` |
94 | if [ $ctx_count -le 1 ];then |
95 | echo "we should execute test_tpm2_createprimary_all.sh first!" |
96 | test_tpm2_createprimary_all.sh |
97 | @@ -59,16 +59,16 @@ if [[ "$@" == *"--sm3256"* ]]; then |
98 | gAlgList="$gAlgList 0x12" |
99 | fi |
100 | |
101 | -for pCtx in `ls /home/$USER/ctx.cpri*` |
102 | +for pCtx in `ls /root/ctx.cpri*` |
103 | do |
104 | for gAlg in $gAlgList |
105 | do |
106 | for GAlg in 0x01 0x08 0x23 0x25 |
107 | do |
108 | - tpm2_create -c $pCtx -g $gAlg -G $GAlg -o /home/$USER/opu."$pCtx".g"$gAlg".G"$GAlg" -O /home/$USER/opr."$pCtx".g"$gAlg".G"$GAlg" |
109 | + tpm2_create -c $pCtx -g $gAlg -G $GAlg -o /root/opu."$pCtx".g"$gAlg".G"$GAlg" -O /root/opr."$pCtx".g"$gAlg".G"$GAlg" |
110 | if [ $? != 0 ];then |
111 | echo "tpm2_create error: pCtx=$pCtx gAlg=$gAlg GAlg=$GAlg" |
112 | - echo "tpm2_create error: pCtx=$pCtx gAlg=$gAlg GAlg=$GAlg" >> /home/$USER/create.error.log |
113 | + echo "tpm2_create error: pCtx=$pCtx gAlg=$gAlg GAlg=$GAlg" >> /root/create.error.log |
114 | STATUS=1 |
115 | fi |
116 | done |
117 | diff --git a/bin/test_tpm2_createprimary_all.sh b/bin/test_tpm2_createprimary_all.sh |
118 | index b7f5f9a..658b6ab 100755 |
119 | --- a/bin/test_tpm2_createprimary_all.sh |
120 | +++ b/bin/test_tpm2_createprimary_all.sh |
121 | @@ -54,7 +54,7 @@ if [[ "$@" == *"--platform"* ]]; then |
122 | AtypeList="$AtypeList p" |
123 | fi |
124 | |
125 | -rm -f /home/$USER/createprimary.error.log /home/$USER/ctx.cpri.* |
126 | +rm -f /root/createprimary.error.log /root/ctx.cpri.* |
127 | |
128 | for gAlg in $gAlgList |
129 | do |
130 | @@ -62,10 +62,10 @@ for gAlg in $gAlgList |
131 | do |
132 | for Atype in $AtypeList |
133 | do |
134 | - tpm2_createprimary -A $Atype -g $gAlg -G $GAlg -C /home/$USER/ctx.cpri."$Atype".g"$gAlg".G"$GAlg" |
135 | + tpm2_createprimary -A $Atype -g $gAlg -G $GAlg -C /root/ctx.cpri."$Atype".g"$gAlg".G"$GAlg" |
136 | if [ $? != 0 ];then |
137 | echo "tpm2_createprimary error: Atype=$Atype gAlg=$gAlg GAlg=$GAlg" |
138 | - echo "tpm2_createprimary error: Atype=$Atype gAlg=$gAlg GAlg=$GAlg" >> /home/$USER/createprimary.error.log |
139 | + echo "tpm2_createprimary error: Atype=$Atype gAlg=$gAlg GAlg=$GAlg" >> /root/createprimary.error.log |
140 | STATUS=1 |
141 | fi |
142 | done |
143 | diff --git a/bin/test_tpm2_encryptdecrypt.sh b/bin/test_tpm2_encryptdecrypt.sh |
144 | index 1d7f4ff..5373595 100755 |
145 | --- a/bin/test_tpm2_encryptdecrypt.sh |
146 | +++ b/bin/test_tpm2_encryptdecrypt.sh |
147 | @@ -35,14 +35,14 @@ alg_primary_key=0x0001 |
148 | alg_create_obj=0x000B |
149 | alg_create_key=0x0025 |
150 | |
151 | -file_input_data=/home/$USER/secret.data |
152 | -file_primary_key_ctx=/home/$USER/context.p_"$alg_primary_obj"_"$alg_primary_key" |
153 | -file_en_decrypt_key_pub=/home/$USER/opu_"$alg_create_obj"_"$alg_create_key" |
154 | -file_en_decrypt_key_priv=/home/$USER/opr_"$alg_create_obj"_"$alg_create_key" |
155 | -file_en_decrypt_key_name=/home/$USER/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
156 | -file_en_decrypt_key_ctx=/home/$USER/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
157 | -file_encrypt_output_data=/home/$USER/encrypt_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
158 | -file_decrypt_output_data=/home/$USER/decrypt_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
159 | +file_input_data=/root/secret.data |
160 | +file_primary_key_ctx=/root/context.p_"$alg_primary_obj"_"$alg_primary_key" |
161 | +file_en_decrypt_key_pub=/root/opu_"$alg_create_obj"_"$alg_create_key" |
162 | +file_en_decrypt_key_priv=/root/opr_"$alg_create_obj"_"$alg_create_key" |
163 | +file_en_decrypt_key_name=/root/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
164 | +file_en_decrypt_key_ctx=/root/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
165 | +file_encrypt_output_data=/root/encrypt_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
166 | +file_decrypt_output_data=/root/decrypt_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
167 | |
168 | fail() |
169 | { |
170 | @@ -51,7 +51,7 @@ fail() |
171 | } |
172 | Pass() |
173 | { |
174 | - echo ""$1" pass" >>/home/$USER/test_getpubak_pass.log |
175 | + echo ""$1" pass" >>/root/test_getpubak_pass.log |
176 | } |
177 | |
178 | rm $file_primary_key_ctx $file_en_decrypt_key_pub $file_en_decrypt_key_priv $file_en_decrypt_key_name $file_en_decrypt_key_ctx $file_encrypt_output_data $file_decrypt_output_data -rf |
179 | diff --git a/bin/test_tpm2_evictcontrol.sh b/bin/test_tpm2_evictcontrol.sh |
180 | index a35aeb5..d58ba45 100755 |
181 | --- a/bin/test_tpm2_evictcontrol.sh |
182 | +++ b/bin/test_tpm2_evictcontrol.sh |
183 | @@ -30,11 +30,11 @@ |
184 | # THE POSSIBILITY OF SUCH DAMAGE. |
185 | #;**********************************************************************; |
186 | #!/bin/bash |
187 | -file_primary_key_ctx=/home/$USER/context.p_B1 |
188 | -file_evict_key_pub=/home/$USER/opuB1_B8 |
189 | -file_evict_key_priv=/home/$USER/oprB1_B8 |
190 | -file_evict_key_ctx=/home/$USER/context_load_out_B1_B8 |
191 | -file_evict_key_name=/home/$USER/name.load.B1_B8 |
192 | +file_primary_key_ctx=/root/context.p_B1 |
193 | +file_evict_key_pub=/root/opuB1_B8 |
194 | +file_evict_key_priv=/root/oprB1_B8 |
195 | +file_evict_key_ctx=/root/context_load_out_B1_B8 |
196 | +file_evict_key_name=/root/name.load.B1_B8 |
197 | |
198 | persistentHandle=0x81010003 |
199 | |
200 | diff --git a/bin/test_tpm2_getpubak.sh b/bin/test_tpm2_getpubak.sh |
201 | index 618173e..139473f 100755 |
202 | --- a/bin/test_tpm2_getpubak.sh |
203 | +++ b/bin/test_tpm2_getpubak.sh |
204 | @@ -36,9 +36,9 @@ ek_alg=0x001 |
205 | ak_alg=0x0001 |
206 | digestAlg=0x000B |
207 | signAlg=0x0014 |
208 | -output_ek_pub=/home/$USER/ek_pub.out |
209 | -output_ak_pub=/home/$USER/ak_pub.out |
210 | -output_ak_pub_name=/home/$USER/ak_name_pub.out |
211 | +output_ek_pub=/root/ek_pub.out |
212 | +output_ak_pub=/root/ak_pub.out |
213 | +output_ak_pub_name=/root/ak_name_pub.out |
214 | |
215 | rm $output_ek_pub $output_ak_pub $output_ak_pub_name -rf |
216 | |
217 | diff --git a/bin/test_tpm2_getpubek.sh b/bin/test_tpm2_getpubek.sh |
218 | index 1025578..ad8eaf0 100755 |
219 | --- a/bin/test_tpm2_getpubek.sh |
220 | +++ b/bin/test_tpm2_getpubek.sh |
221 | @@ -32,7 +32,7 @@ |
222 | #!/bin/bash |
223 | handle_ek=0x81010005 |
224 | ek_alg=0x001 |
225 | -output_ek_pub=/home/$USER/ek_pub.out |
226 | +output_ek_pub=/root/ek_pub.out |
227 | |
228 | rm -f $output_ek_pub |
229 | |
230 | diff --git a/bin/test_tpm2_getrandom.sh b/bin/test_tpm2_getrandom.sh |
231 | index 826162a..7b50ec7 100755 |
232 | --- a/bin/test_tpm2_getrandom.sh |
233 | +++ b/bin/test_tpm2_getrandom.sh |
234 | @@ -33,9 +33,9 @@ |
235 | |
236 | size=32 |
237 | |
238 | -rm -f /home/$USER/random.out |
239 | +rm -f /root/random.out |
240 | |
241 | -tpm2_getrandom -s 32 -o /home/$USER/random.out |
242 | +tpm2_getrandom -s 32 -o /root/random.out |
243 | if [ $? != 0 ];then |
244 | echo "getrandom test fail, please check the environment or parameters!" |
245 | exit 1 |
246 | diff --git a/bin/test_tpm2_getrandom_func.sh b/bin/test_tpm2_getrandom_func.sh |
247 | index 2182ea8..e431e86 100755 |
248 | --- a/bin/test_tpm2_getrandom_func.sh |
249 | +++ b/bin/test_tpm2_getrandom_func.sh |
250 | @@ -32,7 +32,7 @@ |
251 | #!/bin/sh |
252 | #this script for tpm2_getrandom verification |
253 | |
254 | -LOG_FILE=/home/$USER/random_pass_count.log |
255 | +LOG_FILE=/root/random_pass_count.log |
256 | if [ -e "$LOG_FILE" ];then |
257 | rm -f "$LOG_FILE" |
258 | fi |
259 | @@ -40,7 +40,7 @@ i= |
260 | |
261 | #for((i=1;i<=10;i++)); do |
262 | for i in `seq 100`; do |
263 | - tpm2_getrandom -s 32 -o /home/$USER/random_"$i".out |
264 | + tpm2_getrandom -s 32 -o /root/random_"$i".out |
265 | if [ $? != 0 ];then |
266 | echo " create random_"$i".out fail, please check the environment or parameters!" |
267 | exit 2 |
268 | diff --git a/bin/test_tpm2_hash.sh b/bin/test_tpm2_hash.sh |
269 | index 11cc26c..5b24b0b 100755 |
270 | --- a/bin/test_tpm2_hash.sh |
271 | +++ b/bin/test_tpm2_hash.sh |
272 | @@ -35,14 +35,14 @@ |
273 | halg=0x000B |
274 | Hierarchy=e |
275 | |
276 | -rm -f /home/$USER/hash_out_"$Hierarchy"_"$halg" /home/$USER/hash_tk_"$Hierarchy"_"$halg" |
277 | +rm -f /root/hash_out_"$Hierarchy"_"$halg" /root/hash_tk_"$Hierarchy"_"$halg" |
278 | |
279 | -if [ ! -f /home/$USER/hash.in ];then |
280 | -echo "T0naX0u123abc" >/home/$USER/hash.in |
281 | +if [ ! -f /root/hash.in ];then |
282 | +echo "T0naX0u123abc" >/root/hash.in |
283 | fi |
284 | |
285 | |
286 | -tpm2_hash -H $Hierarchy -g $halg -I /home/$USER/hash.in -o /home/$USER/hash_out_"$Hierarchy"_"$halg" -t /home/$USER/hash_tk_"$Hierarchy"_"$halg" |
287 | +tpm2_hash -H $Hierarchy -g $halg -I /root/hash.in -o /root/hash_out_"$Hierarchy"_"$halg" -t /root/hash_tk_"$Hierarchy"_"$halg" |
288 | if [ $? != 0 ];then |
289 | echo "hash forHierarchy:"$Hierarchy"halg:"$halg" fail, please check the environment or parameters!" |
290 | exit 1 |
291 | diff --git a/bin/test_tpm2_hmac.sh b/bin/test_tpm2_hmac.sh |
292 | index a0b5000..e668bd9 100755 |
293 | --- a/bin/test_tpm2_hmac.sh |
294 | +++ b/bin/test_tpm2_hmac.sh |
295 | @@ -38,14 +38,14 @@ halg=0x000B |
296 | |
297 | handle_hmac_key=0x81010013 |
298 | |
299 | -file_primary_key_ctx=/home/$USER/context.p_"$alg_primary_obj"_"$alg_primary_key" |
300 | -file_hmac_key_pub=/home/$USER/opu_"$alg_create_obj"_"$alg_create_key" |
301 | -file_hmac_key_priv=/home/$USER/opr_"$alg_create_obj"_"$alg_create_key" |
302 | -file_hmac_key_name=/home/$USER/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
303 | -file_hmac_key_ctx=/home/$USER/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
304 | -file_hmac_output=/home/$USER/hmac_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
305 | +file_primary_key_ctx=/root/context.p_"$alg_primary_obj"_"$alg_primary_key" |
306 | +file_hmac_key_pub=/root/opu_"$alg_create_obj"_"$alg_create_key" |
307 | +file_hmac_key_priv=/root/opr_"$alg_create_obj"_"$alg_create_key" |
308 | +file_hmac_key_name=/root/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
309 | +file_hmac_key_ctx=/root/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
310 | +file_hmac_output=/root/hmac_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
311 | |
312 | -file_input_data=/home/$USER/secret.data |
313 | +file_input_data=/root/secret.data |
314 | |
315 | fail() |
316 | { |
317 | @@ -54,7 +54,7 @@ fail() |
318 | } |
319 | Pass() |
320 | { |
321 | - echo ""$1" pass" >>/home/$USER/test_getpubak_pass.log |
322 | + echo ""$1" pass" >>/root/test_getpubak_pass.log |
323 | } |
324 | |
325 | rm $file_primary_key_ctx $file_hmac_key_pub $file_hmac_key_priv $file_hmac_key_name $file_hmac_key_ctx $file_hmac_output -rf |
326 | @@ -87,9 +87,9 @@ fi |
327 | |
328 | ####handle test |
329 | rm -f $file_hmac_output |
330 | -tpm2_evictcontrol -A o -c $file_hmac_key_ctx -S $handle_hmac_key |tee /home/$USER/evict.log |
331 | +tpm2_evictcontrol -A o -c $file_hmac_key_ctx -S $handle_hmac_key |tee /root/evict.log |
332 | c1="$?" |
333 | -grep "persistentHandle: "$handle_hmac_key"" /home/$USER/evict.log |
334 | +grep "persistentHandle: "$handle_hmac_key"" /root/evict.log |
335 | c2="$?" |
336 | |
337 | if [ $c1 != 0 ] || [ $c2 != 0 ];then |
338 | diff --git a/bin/test_tpm2_listpcrs.sh b/bin/test_tpm2_listpcrs.sh |
339 | index 3fac1cf..beaa55d 100755 |
340 | --- a/bin/test_tpm2_listpcrs.sh |
341 | +++ b/bin/test_tpm2_listpcrs.sh |
342 | @@ -46,9 +46,9 @@ if [ $? != 0 ];then |
343 | exit 1 |
344 | fi |
345 | |
346 | -rm -rf /home/$USER/pcrs |
347 | +rm -rf /root/pcrs |
348 | |
349 | -tpm2_listpcrs -L 0x04:17,18,19+0x0b:0,17,18,19 -o /home/$USER/pcrs |
350 | +tpm2_listpcrs -L 0x04:17,18,19+0x0b:0,17,18,19 -o /root/pcrs |
351 | |
352 | if [ $? != 0 ];then |
353 | echo "listpcrs fail!" |
354 | diff --git a/bin/test_tpm2_load.sh b/bin/test_tpm2_load.sh |
355 | index e348d79..297a980 100755 |
356 | --- a/bin/test_tpm2_load.sh |
357 | +++ b/bin/test_tpm2_load.sh |
358 | @@ -37,12 +37,12 @@ alg_create_key=0x0008 |
359 | |
360 | alg_load=0x0004 |
361 | |
362 | -file_primary_key_ctx=/home/$USER/context.p_"$alg_primary_obj"_"$alg_primary_key" |
363 | -file_load_key_pub=/home/$USER/opu_"$alg_create_obj"_"$alg_create_key" |
364 | -file_load_key_priv=/home/$USER/opr_"$alg_create_obj"_"$alg_create_key" |
365 | -file_load_key_name=/home/$USER/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
366 | -file_load_key_ctx=/home/$USER/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
367 | -file_load_output=/home/$USER/load_"$file_load_key_ctx" |
368 | +file_primary_key_ctx=/root/context.p_"$alg_primary_obj"_"$alg_primary_key" |
369 | +file_load_key_pub=/root/opu_"$alg_create_obj"_"$alg_create_key" |
370 | +file_load_key_priv=/root/opr_"$alg_create_obj"_"$alg_create_key" |
371 | +file_load_key_name=/root/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
372 | +file_load_key_ctx=/root/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
373 | +file_load_output=/root/load_"$file_load_key_ctx" |
374 | |
375 | Handle_parent=0x81010018 |
376 | Handle_ek_load=0x81010017 |
377 | @@ -55,7 +55,7 @@ fail() |
378 | } |
379 | Pass() |
380 | { |
381 | - echo ""$1" pass" >>/home/$USER/test_getpubak_pass.log |
382 | + echo ""$1" pass" >>/root/test_getpubak_pass.log |
383 | } |
384 | |
385 | rm $file_primary_key_ctx $file_load_key_pub $file_load_key_priv $file_load_key_name $file_load_key_ctx $file_load_output -rf |
386 | diff --git a/bin/test_tpm2_loadexternal.sh b/bin/test_tpm2_loadexternal.sh |
387 | index 60da495..c60f363 100755 |
388 | --- a/bin/test_tpm2_loadexternal.sh |
389 | +++ b/bin/test_tpm2_loadexternal.sh |
390 | @@ -36,12 +36,12 @@ alg_create_obj=0x000B |
391 | alg_create_key=0x0008 |
392 | |
393 | |
394 | -file_primary_key_ctx=/home/$USER/context.p_"$alg_primary_obj"_"$alg_primary_key" |
395 | -file_loadexternal_key_pub=/home/$USER/opu_"$alg_create_obj"_"$alg_create_key" |
396 | -file_loadexternal_key_priv=/home/$USER/opr_"$alg_create_obj"_"$alg_create_key" |
397 | -file_loadexternal_key_name=/home/$USER/name.loadexternal_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
398 | -file_loadexternal_key_ctx=/home/$USER/ctx_loadexternal_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
399 | -file_loadexternal_output=/home/$USER/loadexternal_"$file_loadexternal_key_ctx" |
400 | +file_primary_key_ctx=/root/context.p_"$alg_primary_obj"_"$alg_primary_key" |
401 | +file_loadexternal_key_pub=/root/opu_"$alg_create_obj"_"$alg_create_key" |
402 | +file_loadexternal_key_priv=/root/opr_"$alg_create_obj"_"$alg_create_key" |
403 | +file_loadexternal_key_name=/root/name.loadexternal_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
404 | +file_loadexternal_key_ctx=/root/ctx_loadexternal_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
405 | +file_loadexternal_output=/root/loadexternal_"$file_loadexternal_key_ctx" |
406 | |
407 | Handle_parent=0x81010019 |
408 | |
409 | @@ -53,7 +53,7 @@ fail() |
410 | } |
411 | Pass() |
412 | { |
413 | - echo ""$1" pass" >>/home/$USER/test_getpubak_pass.log |
414 | + echo ""$1" pass" >>/root/test_getpubak_pass.log |
415 | } |
416 | |
417 | rm $file_primary_key_ctx $file_loadexternal_key_pub $file_loadexternal_key_priv $file_loadexternal_key_name $file_loadexternal_key_ctx $file_loadexternal_output -rf |
418 | diff --git a/bin/test_tpm2_makecredential.sh b/bin/test_tpm2_makecredential.sh |
419 | index 741ec4e..04969fd 100755 |
420 | --- a/bin/test_tpm2_makecredential.sh |
421 | +++ b/bin/test_tpm2_makecredential.sh |
422 | @@ -37,11 +37,11 @@ ak_alg=0x0001 |
423 | digestAlg=0x000B |
424 | signAlg=0x0014 |
425 | |
426 | -file_input_data=/home/$USER/secret.data |
427 | -output_ek_pub=/home/$USER/ek_pub.out |
428 | -output_ak_pub=/home/$USER/ak_pub.out |
429 | -output_ak_pub_name=/home/$USER/ak_name_pub.out |
430 | -output_mkcredential=/home/$USER/mkcredential.out |
431 | +file_input_data=/root/secret.data |
432 | +output_ek_pub=/root/ek_pub.out |
433 | +output_ak_pub=/root/ak_pub.out |
434 | +output_ak_pub_name=/root/ak_name_pub.out |
435 | +output_mkcredential=/root/mkcredential.out |
436 | |
437 | rm $output_ek_pub $output_ak_pub $output_ak_pub_name $output_mkcredential -rf |
438 | |
439 | @@ -56,14 +56,14 @@ if [ $? != 0 ] || [ ! -e $output_ek_pub ];then |
440 | exit 1 |
441 | fi |
442 | |
443 | -tpm2_getpubak -E $handle_ek -k $handle_ak -g $ak_alg -D $digestAlg -s $signAlg -f $output_ak_pub -n $output_ak_pub_name |tee /home/$USER/output_ak |
444 | +tpm2_getpubak -E $handle_ek -k $handle_ak -g $ak_alg -D $digestAlg -s $signAlg -f $output_ak_pub -n $output_ak_pub_name |tee /root/output_ak |
445 | |
446 | -if [ $? != 0 ] || [ ! -e /home/$USER/output_ak ];then |
447 | +if [ $? != 0 ] || [ ! -e /root/output_ak ];then |
448 | echo "getpubak fail, please check the environment or parameters!" |
449 | exit 1 |
450 | fi |
451 | -grep -A 3 "Name of loaded key:" /home/$USER/output_ak|tr "\n" " " >/home/$USER/grep.txt |
452 | -Loadkeyname=`sed -e 's/ //g' /home/$USER/grep.txt | awk -F':' '{print $2}'` |
453 | +grep -A 3 "Name of loaded key:" /root/output_ak|tr "\n" " " >/root/grep.txt |
454 | +Loadkeyname=`sed -e 's/ //g' /root/grep.txt | awk -F':' '{print $2}'` |
455 | |
456 | tpm2_makecredential -e $output_ek_pub -s $file_input_data -n $Loadkeyname -o $output_mkcredential |
457 | |
458 | diff --git a/bin/test_tpm2_nv.sh b/bin/test_tpm2_nv.sh |
459 | index 4ee0fbe..636455e 100755 |
460 | --- a/bin/test_tpm2_nv.sh |
461 | +++ b/bin/test_tpm2_nv.sh |
462 | @@ -55,10 +55,10 @@ fi |
463 | |
464 | |
465 | if [ ! -f nv.test_w ];then |
466 | -echo "please123abc" >/home/$USER/nv.test_w |
467 | +echo "please123abc" >/root/nv.test_w |
468 | fi |
469 | |
470 | -tpm2_nvwrite -x $nv_test_index -a $nv_auth_handle -f /home/$USER/nv.test_w |
471 | +tpm2_nvwrite -x $nv_test_index -a $nv_auth_handle -f /root/nv.test_w |
472 | if [ $? != 0 ];then |
473 | echo "nvwrite fail!" |
474 | exit 1 |
475 | diff --git a/bin/test_tpm2_readpublic.sh b/bin/test_tpm2_readpublic.sh |
476 | index 5281709..2aa56f0 100755 |
477 | --- a/bin/test_tpm2_readpublic.sh |
478 | +++ b/bin/test_tpm2_readpublic.sh |
479 | @@ -35,12 +35,12 @@ alg_primary_key=0x0001 |
480 | alg_create_obj=0x000B |
481 | alg_create_key=0x0008 |
482 | |
483 | -file_primary_key_ctx=/home/$USER/context.p_"$alg_primary_obj"_"$alg_primary_key" |
484 | -file_readpub_key_pub=/home/$USER/opu_"$alg_create_obj"_"$alg_create_key" |
485 | -file_readpub_key_priv=/home/$USER/opr_"$alg_create_obj"_"$alg_create_key" |
486 | -file_readpub_key_name=/home/$USER/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
487 | -file_readpub_key_ctx=/home/$USER/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
488 | -file_readpub_output=/home/$USER/readpub_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
489 | +file_primary_key_ctx=/root/context.p_"$alg_primary_obj"_"$alg_primary_key" |
490 | +file_readpub_key_pub=/root/opu_"$alg_create_obj"_"$alg_create_key" |
491 | +file_readpub_key_priv=/root/opr_"$alg_create_obj"_"$alg_create_key" |
492 | +file_readpub_key_name=/root/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
493 | +file_readpub_key_ctx=/root/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
494 | +file_readpub_output=/root/readpub_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
495 | |
496 | Handle_readpub=0x81010014 |
497 | |
498 | @@ -51,7 +51,7 @@ fail() |
499 | } |
500 | Pass() |
501 | { |
502 | - echo ""$1" pass" >>/home/$USER/test_getpubak_pass.log |
503 | + echo ""$1" pass" >>/root/test_getpubak_pass.log |
504 | } |
505 | |
506 | rm $file_primary_key_ctx $file_readpub_key_pub $file_readpub_key_priv $file_readpub_key_name $file_readpub_key_ctx $file_readpub_output -rf |
507 | diff --git a/bin/test_tpm2_rsadecrypt.sh b/bin/test_tpm2_rsadecrypt.sh |
508 | index 156c703..7cf7797 100755 |
509 | --- a/bin/test_tpm2_rsadecrypt.sh |
510 | +++ b/bin/test_tpm2_rsadecrypt.sh |
511 | @@ -30,16 +30,16 @@ |
512 | # THE POSSIBILITY OF SUCH DAMAGE. |
513 | #;**********************************************************************; |
514 | #!/bin/bash |
515 | -file_primary_key_ctx=/home/$USER/context.p_B1 |
516 | -file_rsaencrypt_key_pub=/home/$USER/opuB1_B8 |
517 | -file_rsaencrypt_key_priv=/home/$USER/oprB1_B8 |
518 | -file_rsaencrypt_key_ctx=/home/$USER/context_loadext_out_B1_B8 |
519 | -file_rsadecrypt_key_ctx=/home/$USER/context_load_out_B1_B8 |
520 | -file_rsaencrypt_key_name=/home/$USER/name.load.B1_B8 |
521 | +file_primary_key_ctx=/root/context.p_B1 |
522 | +file_rsaencrypt_key_pub=/root/opuB1_B8 |
523 | +file_rsaencrypt_key_priv=/root/oprB1_B8 |
524 | +file_rsaencrypt_key_ctx=/root/context_loadext_out_B1_B8 |
525 | +file_rsadecrypt_key_ctx=/root/context_load_out_B1_B8 |
526 | +file_rsaencrypt_key_name=/root/name.load.B1_B8 |
527 | |
528 | -file_rsa_en_output_data=/home/$USER/rsa_en.out |
529 | -file_rsa_de_output_data=/home/$USER/rsa_de.out |
530 | -file_input_data=/home/$USER/secret.data |
531 | +file_rsa_en_output_data=/root/rsa_en.out |
532 | +file_rsa_de_output_data=/root/rsa_de.out |
533 | +file_input_data=/root/secret.data |
534 | |
535 | alg_hash=0x000B |
536 | alg_primary_key=0x0001 |
537 | diff --git a/bin/test_tpm2_rsaencrypt.sh b/bin/test_tpm2_rsaencrypt.sh |
538 | index 0edb6a9..0b560b2 100755 |
539 | --- a/bin/test_tpm2_rsaencrypt.sh |
540 | +++ b/bin/test_tpm2_rsaencrypt.sh |
541 | @@ -30,14 +30,14 @@ |
542 | # THE POSSIBILITY OF SUCH DAMAGE. |
543 | #;**********************************************************************; |
544 | #!/bin/bash |
545 | -file_primary_key_ctx=/home/$USER/context.p_B1 |
546 | -file_rsaencrypt_key_pub=/home/$USER/opuB1_B8 |
547 | -file_rsaencrypt_key_priv=/home/$USER/oprB1_B8 |
548 | -file_rsaencrypt_key_ctx=/home/$USER/context_load_out_B1_B8 |
549 | -file_rsaencrypt_key_name=/home/$USER/name.load.B1_B8 |
550 | +file_primary_key_ctx=/root/context.p_B1 |
551 | +file_rsaencrypt_key_pub=/root/opuB1_B8 |
552 | +file_rsaencrypt_key_priv=/root/oprB1_B8 |
553 | +file_rsaencrypt_key_ctx=/root/context_load_out_B1_B8 |
554 | +file_rsaencrypt_key_name=/root/name.load.B1_B8 |
555 | |
556 | -file_rsa_en_output_data=/home/$USER/rsa_en.out |
557 | -file_input_data=/home/$USER/secret.data |
558 | +file_rsa_en_output_data=/root/rsa_en.out |
559 | +file_input_data=/root/secret.data |
560 | |
561 | alg_hash=0x000B |
562 | alg_primary_key=0x0001 |
563 | diff --git a/bin/test_tpm2_sign.sh b/bin/test_tpm2_sign.sh |
564 | index 1c6f431..8e23645 100755 |
565 | --- a/bin/test_tpm2_sign.sh |
566 | +++ b/bin/test_tpm2_sign.sh |
567 | @@ -31,13 +31,13 @@ |
568 | #;**********************************************************************; |
569 | #!/bin/bash |
570 | |
571 | -file_primary_key_ctx=/home/$USER/context.p_B1 |
572 | -file_signing_key_pub=/home/$USER/opuB1_B8 |
573 | -file_signing_key_priv=/home/$USER/oprB1_B8 |
574 | -file_signing_key_ctx=/home/$USER/context_load_out_B1_B8 |
575 | -file_signing_key_name=/home/$USER/name.load.B1_B8 |
576 | -file_input_data=/home/$USER/secret.data |
577 | -file_output_data=/home/$USER/sig.4 |
578 | +file_primary_key_ctx=/root/context.p_B1 |
579 | +file_signing_key_pub=/root/opuB1_B8 |
580 | +file_signing_key_priv=/root/oprB1_B8 |
581 | +file_signing_key_ctx=/root/context_load_out_B1_B8 |
582 | +file_signing_key_name=/root/name.load.B1_B8 |
583 | +file_input_data=/root/secret.data |
584 | +file_output_data=/root/sig.4 |
585 | |
586 | |
587 | handle_signing_key=0x81010005 |
588 | @@ -53,7 +53,7 @@ fail() |
589 | } |
590 | Pass() |
591 | { |
592 | - echo ""$1" pass" >>/home/$USER/test_getpubak_pass.log |
593 | + echo ""$1" pass" >>/root/test_getpubak_pass.log |
594 | } |
595 | |
596 | |
597 | @@ -85,9 +85,9 @@ else |
598 | rm $file_output_data -rf |
599 | fi |
600 | |
601 | -tpm2_evictcontrol -A o -c $file_signing_key_ctx -S $handle_signing_key |tee /home/$USER/evict.log |
602 | +tpm2_evictcontrol -A o -c $file_signing_key_ctx -S $handle_signing_key |tee /root/evict.log |
603 | c1="$?" |
604 | -grep "persistentHandle: "$handle_signing_key"" /home/$USER/evict.log |
605 | +grep "persistentHandle: "$handle_signing_key"" /root/evict.log |
606 | c2="$?" |
607 | |
608 | if [ $c1 != 0 ] || [ $c2 != 0 ];then |
609 | diff --git a/bin/test_tpm2_unseal.sh b/bin/test_tpm2_unseal.sh |
610 | index d66ef8d..9fec84e 100755 |
611 | --- a/bin/test_tpm2_unseal.sh |
612 | +++ b/bin/test_tpm2_unseal.sh |
613 | @@ -35,13 +35,13 @@ alg_primary_key=0x0001 |
614 | alg_create_obj=0x000B |
615 | alg_create_key=0x0008 |
616 | |
617 | -file_input_data=/home/$USER/secret.data |
618 | -file_primary_key_ctx=/home/$USER/context.p_"$alg_primary_obj"_"$alg_primary_key" |
619 | -file_unseal_key_pub=/home/$USER/opu_"$alg_create_obj"_"$alg_create_key" |
620 | -file_unseal_key_priv=/home/$USER/opr_"$alg_create_obj"_"$alg_create_key" |
621 | -file_unseal_key_ctx=/home/$USER/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
622 | -file_unseal_key_name=/home/$USER/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
623 | -file_unseal_output_data=/home/$USER/usl_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
624 | +file_input_data=/root/secret.data |
625 | +file_primary_key_ctx=/root/context.p_"$alg_primary_obj"_"$alg_primary_key" |
626 | +file_unseal_key_pub=/root/opu_"$alg_create_obj"_"$alg_create_key" |
627 | +file_unseal_key_priv=/root/opr_"$alg_create_obj"_"$alg_create_key" |
628 | +file_unseal_key_ctx=/root/ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
629 | +file_unseal_key_name=/root/name.load_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
630 | +file_unseal_output_data=/root/usl_ctx_load_out_"$alg_primary_obj"_"$alg_primary_key"-"$alg_create_obj"_"$alg_create_key" |
631 | |
632 | rm $file_primary_key_ctx $file_unseal_key_pub $file_unseal_key_priv $file_unseal_key_ctx $file_unseal_key_name $file_unseal_output_data -rf |
633 | |
634 | diff --git a/bin/test_tpm2_verifysignature.sh b/bin/test_tpm2_verifysignature.sh |
635 | index 6078971..e173f53 100755 |
636 | --- a/bin/test_tpm2_verifysignature.sh |
637 | +++ b/bin/test_tpm2_verifysignature.sh |
638 | @@ -30,17 +30,17 @@ |
639 | # THE POSSIBILITY OF SUCH DAMAGE. |
640 | #;**********************************************************************; |
641 | #!/bin/bash |
642 | -file_primary_key_ctx=/home/$USER/context.p_B1 |
643 | -file_signing_key_pub=/home/$USER/opuB1_B8 |
644 | -file_signing_key_priv=/home/$USER/oprB1_B8 |
645 | -file_signing_key_ctx=/home/$USER/context_load_out_B1_B8 |
646 | -file_signing_key_name=/home/$USER/name.load.B1_B8 |
647 | -file_input_data=/home/$USER/secret.data |
648 | -file_output_data=/home/$USER/sig.4 |
649 | -file_verify_tk_data=/home/$USER/tickt_verify_sig.4 |
650 | - |
651 | -file_input_data_hash=/home/$USER/secret_hash.data |
652 | -file_input_data_hash_tk=/home/$USER/secret_hash_tk.data |
653 | +file_primary_key_ctx=/root/context.p_B1 |
654 | +file_signing_key_pub=/root/opuB1_B8 |
655 | +file_signing_key_priv=/root/oprB1_B8 |
656 | +file_signing_key_ctx=/root/context_load_out_B1_B8 |
657 | +file_signing_key_name=/root/name.load.B1_B8 |
658 | +file_input_data=/root/secret.data |
659 | +file_output_data=/root/sig.4 |
660 | +file_verify_tk_data=/root/tickt_verify_sig.4 |
661 | + |
662 | +file_input_data_hash=/root/secret_hash.data |
663 | +file_input_data_hash_tk=/root/secret_hash_tk.data |
664 | |
665 | handle_signing_key=0x81010005 |
666 | |
667 | @@ -55,7 +55,7 @@ fail() |
668 | } |
669 | Pass() |
670 | { |
671 | - echo ""$1" pass" >>/home/$USER/test_getpubak_pass.log |
672 | + echo ""$1" pass" >>/root/test_getpubak_pass.log |
673 | } |
674 | |
675 | |
676 | diff --git a/units/tpm2_1.1.pxu b/units/tpm2_1.1.pxu |
677 | index 67a2947..d875f09 100644 |
678 | --- a/units/tpm2_1.1.pxu |
679 | +++ b/units/tpm2_1.1.pxu |
680 | @@ -41,6 +41,7 @@ category_id: tpm2 |
681 | depends: tpm2.0/init-resource-mgr |
682 | estimated_duration: 2 |
683 | plugin: shell |
684 | +user: root |
685 | _summary: tpm2_takeownership |
686 | command: test_tpm2_takeownership_all.sh |
687 | flags: preserve-cwd |
688 | @@ -50,6 +51,7 @@ category_id: tpm2 |
689 | depends: tpm2.0/tpm2_takeownership |
690 | estimated_duration: 2 |
691 | plugin: shell |
692 | +user: root |
693 | _summary: tpm2_createprimary |
694 | command: test_tpm2_createprimary_all.sh |
695 | flags: preserve-cwd |
696 | @@ -59,6 +61,7 @@ category_id: tpm2 |
697 | depends: tpm2.0/tpm2_createprimary_all |
698 | estimated_duration: 2 |
699 | plugin: shell |
700 | +user: root |
701 | _summary: tpm2_create |
702 | command: test_tpm2_create_all.sh |
703 | flags: preserve-cwd |
704 | @@ -68,6 +71,7 @@ category_id: tpm2 |
705 | depends: tpm2.0/tpm2_takeownership |
706 | estimated_duration: 2 |
707 | plugin: shell |
708 | +user: root |
709 | _summary: tpm2 NV tools |
710 | command: test_tpm2_nv.sh |
711 | flags: preserve-cwd |
712 | @@ -77,6 +81,7 @@ category_id: tpm2 |
713 | depends: tpm2.0/tpm2_takeownership |
714 | estimated_duration: 15 |
715 | plugin: shell |
716 | +user: root |
717 | _summary: tpm2_listpcrs |
718 | command: test_tpm2_listpcrs.sh |
719 | flags: preserve-cwd |
720 | @@ -86,6 +91,7 @@ category_id: tpm2 |
721 | depends: tpm2.0/tpm2_takeownership |
722 | estimated_duration: 2 |
723 | plugin: shell |
724 | +user: root |
725 | _summary: tpm2_getrandom |
726 | command: test_tpm2_getrandom.sh |
727 | flags: preserve-cwd |
728 | @@ -95,6 +101,7 @@ category_id: tpm2 |
729 | depends: tpm2.0/tpm2_takeownership |
730 | estimated_duration: 20 |
731 | plugin: shell |
732 | +user: root |
733 | _summary: tpm2_load |
734 | command: test_tpm2_load.sh |
735 | flags: preserve-cwd |
736 | @@ -104,6 +111,7 @@ category_id: tpm2 |
737 | depends: tpm2.0/tpm2_takeownership |
738 | estimated_duration: 20 |
739 | plugin: shell |
740 | +user: root |
741 | _summary: tpm2_loadexternal |
742 | command: test_tpm2_loadexternal.sh |
743 | flags: preserve-cwd |
744 | @@ -113,6 +121,7 @@ category_id: tpm2 |
745 | depends: tpm2.0/tpm2_takeownership |
746 | estimated_duration: 20 |
747 | plugin: shell |
748 | +user: root |
749 | _summary: tpm2_evictcontrol |
750 | command: test_tpm2_evictcontrol.sh |
751 | flags: preserve-cwd |
752 | @@ -122,6 +131,7 @@ category_id: tpm2 |
753 | depends: tpm2.0/tpm2_takeownership |
754 | estimated_duration: 20 |
755 | plugin: shell |
756 | +user: root |
757 | _summary: tpm2_hash |
758 | command: test_tpm2_hash.sh |
759 | flags: preserve-cwd |
760 | @@ -131,6 +141,7 @@ category_id: tpm2 |
761 | depends: tpm2.0/tpm2_takeownership |
762 | estimated_duration: 10 |
763 | plugin: shell |
764 | +user: root |
765 | _summary: tpm2_hmac |
766 | command: test_tpm2_hmac.sh |
767 | flags: preserve-cwd |
768 | @@ -140,6 +151,7 @@ category_id: tpm2 |
769 | depends: tpm2.0/tpm2_takeownership |
770 | estimated_duration: 10 |
771 | plugin: shell |
772 | +user: root |
773 | _summary: tpm2_quote |
774 | command: test_tpm2_quote.sh |
775 | flags: preserve-cwd |
776 | @@ -149,6 +161,7 @@ category_id: tpm2 |
777 | depends: tpm2.0/tpm2_takeownership |
778 | estimated_duration: 20 |
779 | plugin: shell |
780 | +user: root |
781 | _summary: tpm2_unseal |
782 | command: test_tpm2_unseal.sh |
783 | flags: preserve-cwd |
784 | @@ -158,6 +171,7 @@ category_id: tpm2 |
785 | depends: tpm2.0/tpm2_takeownership |
786 | estimated_duration: 20 |
787 | plugin: shell |
788 | +user: root |
789 | _summary: tpm2_akparse |
790 | command: test_tpm2_akparse.sh |
791 | flags: preserve-cwd |
792 | @@ -167,6 +181,7 @@ category_id: tpm2 |
793 | depends: tpm2.0/tpm2_takeownership |
794 | estimated_duration: 20 |
795 | plugin: shell |
796 | +user: root |
797 | _summary: tpm2_certify |
798 | command: test_tpm2_certify.sh |
799 | flags: preserve-cwd |
800 | @@ -176,6 +191,7 @@ category_id: tpm2 |
801 | depends: tpm2.0/tpm2_takeownership |
802 | estimated_duration: 10 |
803 | plugin: shell |
804 | +user: root |
805 | _summary: tpm2_getpubek |
806 | command: test_tpm2_getpubek.sh |
807 | flags: preserve-cwd |
808 | @@ -185,6 +201,7 @@ category_id: tpm2 |
809 | depends: tpm2.0/tpm2_takeownership |
810 | estimated_duration: 10 |
811 | plugin: shell |
812 | +user: root |
813 | _summary: tpm2_getpubak |
814 | command: test_tpm2_getpubak.sh |
815 | flags: preserve-cwd |
816 | @@ -194,6 +211,7 @@ category_id: tpm2 |
817 | depends: tpm2.0/tpm2_takeownership |
818 | estimated_duration: 20 |
819 | plugin: shell |
820 | +user: root |
821 | _summary: tpm2_makecredential |
822 | command: test_tpm2_makecredential.sh |
823 | flags: preserve-cwd |
824 | @@ -203,6 +221,7 @@ category_id: tpm2 |
825 | depends: tpm2.0/tpm2_takeownership |
826 | estimated_duration: 20 |
827 | plugin: shell |
828 | +user: root |
829 | _summary: tpm2_activatecredential |
830 | command: test_tpm2_activecredential.sh |
831 | flags: preserve-cwd |
832 | @@ -212,6 +231,7 @@ category_id: tpm2 |
833 | depends: tpm2.0/tpm2_takeownership |
834 | estimated_duration: 20 |
835 | plugin: shell |
836 | +user: root |
837 | _summary: tpm2_readpublic |
838 | command: test_tpm2_readpublic.sh |
839 | flags: preserve-cwd |
840 | @@ -221,6 +241,7 @@ category_id: tpm2 |
841 | depends: tpm2.0/tpm2_takeownership |
842 | estimated_duration: 40 |
843 | plugin: shell |
844 | +user: root |
845 | _summary: tpm2_rsaencrypt |
846 | command: test_tpm2_rsaencrypt.sh |
847 | flags: preserve-cwd |
848 | @@ -230,6 +251,7 @@ category_id: tpm2 |
849 | depends: tpm2.0/tpm2_takeownership |
850 | estimated_duration: 40 |
851 | plugin: shell |
852 | +user: root |
853 | _summary: tpm2_rsadecrypt |
854 | command: test_tpm2_rsadecrypt.sh |
855 | flags: preserve-cwd |
856 | @@ -239,6 +261,7 @@ category_id: tpm2 |
857 | depends: tpm2.0/tpm2_takeownership |
858 | estimated_duration: 40 |
859 | plugin: shell |
860 | +user: root |
861 | _summary: tpm2_encryptdecrypt |
862 | command: test_tpm2_encryptdecrypt.sh |
863 | flags: preserve-cwd |
864 | @@ -248,6 +271,7 @@ category_id: tpm2 |
865 | depends: tpm2.0/tpm2_takeownership |
866 | estimated_duration: 20 |
867 | plugin: shell |
868 | +user: root |
869 | _summary: tpm2_sign |
870 | command: test_tpm2_sign.sh |
871 | flags: preserve-cwd |
872 | @@ -257,6 +281,7 @@ category_id: tpm2 |
873 | depends: tpm2.0/tpm2_takeownership |
874 | estimated_duration: 20 |
875 | plugin: shell |
876 | +user: root |
877 | _summary: tpm2_verifysignature |
878 | command: test_tpm2_verifysignature.sh |
879 | flags: preserve-cwd |
+/- 1
Let me xplain, it's probably the less annoying way to solve the problem but keep in mind the same test are used via deb packages too.
So let's keep your first commit but also add user: root to every single job in: https:/ /git.launchpad. net/plainbox- provider- tpm2/tree/ units/tpm2_ 1.1.pxu