Menu
▾
▴
[Trousers-cvs] testsuite/tcg/highlevel key_auth_chain01.c key_auth_chain02.c key_auth_check01.c key_auth_check02.c key_conflict01.c key_loading_auth.c key_loading.c policy_no_secret.c ps_stress.c run_functional_tests.sh Tspi_PolicyChecking01.c
Update of /cvsroot/trousers/testsuite/tcg/highlevel In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25205/tcg/highlevel Modified Files: key_auth_chain01.c key_auth_chain02.c key_auth_check01.c key_auth_check02.c key_conflict01.c key_loading_auth.c key_loading.c policy_no_secret.c ps_stress.c run_functional_tests.sh Tspi_PolicyChecking01.c Log Message: Added support for testing with a no-auth SRK Index: key_auth_chain02.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/key_auth_chain02.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key_auth_chain02.c 9 Jun 2006 22:02:51 -0000 1.3 --- key_auth_chain02.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 189,192 **** --- 189,193 ---- #if 0 + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 206,209 **** --- 207,211 ---- goto done; } + #endif /* ######## Start Key 0 ######## */ Index: key_conflict01.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/key_conflict01.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key_conflict01.c 9 Jun 2006 22:02:51 -0000 1.3 --- key_conflict01.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 192,195 **** --- 192,196 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 209,212 **** --- 210,214 ---- goto done; } + #endif /* ######## Start Key 0 ######## */ Index: Tspi_PolicyChecking01.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/Tspi_PolicyChecking01.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Tspi_PolicyChecking01.c 27 Jun 2005 20:40:30 -0000 1.2 --- Tspi_PolicyChecking01.c 21 Sep 2006 15:36:37 -0000 1.3 *************** *** 139,143 **** { print_success( function1, result); - exitCode1 = 0; } } --- 139,142 ---- *************** *** 162,166 **** { print_success( function1, result); - exitCode1 = 0; } } --- 161,164 ---- *************** *** 208,212 **** { print_success( function1, result); - exitCode1 = 0; } } --- 206,209 ---- *************** *** 232,240 **** { print_success( function1, result); - exitCode1 = 0; } } fprintf( stderr, "\t\tFlag set in policy object?: %x\n", ES ); ! if( exitCode1 == 0 ) print_success( function, result ); --- 229,236 ---- { print_success( function1, result); } } fprintf( stderr, "\t\tFlag set in policy object?: %x\n", ES ); ! if( exitCode1 == 0 ) print_success( function, result ); *************** *** 257,261 **** { print_success( function1, result); - exitCode1 = 0; } --- 253,256 ---- *************** *** 274,278 **** { print_success( function1, result ); - exitCode1 = 0; } --- 269,272 ---- Index: run_functional_tests.sh =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/run_functional_tests.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** run_functional_tests.sh 1 Sep 2006 16:52:49 -0000 1.5 --- run_functional_tests.sh 21 Sep 2006 15:36:37 -0000 1.6 *************** *** 35,38 **** --- 35,39 ---- ./key/Tspi_Key_CreateKeyWithPcrs -v $VERSION || exit $? ./key/Tspi_Key_WrapKeyToPcr -v $VERSION || exit $? + ./key/Tspi_Key_ConvertMigrationBlob02 -v $VERSION || exit $? # tpm tests *************** *** 51,54 **** --- 52,56 ---- ./tpm/Tspi_TPM_GetCapability07 -v $VERSION || exit $? ./tpm/Tspi_TPM_DirWrite04 -v $VERSION || exit $? + ./tpm/Tspi_TPM_CreateIdentity -v $VERSION || exit $? # tspi tests Index: key_auth_check02.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/key_auth_check02.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key_auth_check02.c 9 Jun 2006 22:02:51 -0000 1.3 --- key_auth_check02.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 133,136 **** --- 133,137 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 156,159 **** --- 157,161 ---- exit( result ); } + #endif //Load Key By UUID Index: key_auth_chain01.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/key_auth_chain01.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key_auth_chain01.c 9 Jun 2006 22:02:51 -0000 1.3 --- key_auth_chain01.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 143,146 **** --- 143,147 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 160,163 **** --- 161,165 ---- goto done; } + #endif /* ######## Start Key 0 ######## */ Index: policy_no_secret.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/policy_no_secret.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** policy_no_secret.c 9 Jun 2006 22:02:51 -0000 1.2 --- policy_no_secret.c 21 Sep 2006 15:36:37 -0000 1.3 *************** *** 121,124 **** --- 121,125 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject(hSRK, TSS_POLICY_USAGE, &srkUsagePolicy); *************** *** 140,143 **** --- 141,145 ---- exit(result); } + #endif // With a secret set, this should work OK result = Tspi_Key_CreateKey(hKey, hSRK, 0); Index: ps_stress.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/ps_stress.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ps_stress.c 9 Jun 2006 22:02:51 -0000 1.3 --- ps_stress.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 103,106 **** --- 103,107 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 120,123 **** --- 121,125 ---- return result; } + #endif return TSS_SUCCESS; *************** *** 197,200 **** --- 199,203 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 214,217 **** --- 217,221 ---- goto done; } + #endif /* create one key of each size, 512, 1024 and 2048 */ Index: key_loading_auth.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/key_loading_auth.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key_loading_auth.c 9 Jun 2006 22:02:51 -0000 1.3 --- key_loading_auth.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 202,205 **** --- 202,206 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 219,223 **** goto done; } ! /* load a bunch of keys, creating when necessary */ --- 220,224 ---- goto done; } ! #endif /* load a bunch of keys, creating when necessary */ Index: key_auth_check01.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/key_auth_check01.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key_auth_check01.c 9 Jun 2006 22:02:51 -0000 1.3 --- key_auth_check01.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 131,134 **** --- 131,135 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 154,157 **** --- 155,159 ---- exit( result ); } + #endif //Create Signing Key Index: key_loading.c =================================================================== RCS file: /cvsroot/trousers/testsuite/tcg/highlevel/key_loading.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key_loading.c 9 Jun 2006 22:02:51 -0000 1.3 --- key_loading.c 21 Sep 2006 15:36:37 -0000 1.4 *************** *** 187,190 **** --- 187,191 ---- } + #ifndef TESTSUITE_NOAUTH_SRK //Get Policy Object result = Tspi_GetPolicyObject( hSRK, TSS_POLICY_USAGE, *************** *** 204,208 **** goto done; } ! /* load a bunch of keys, creating when necessary */ --- 205,209 ---- goto done; } ! #endif /* load a bunch of keys, creating when necessary */ |