]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Fix selection of TPM2 key gen tools
authorSabin Rapan <sabin.rapan@gmail.com>
Wed, 28 Jul 2021 09:51:28 +0000 (12:51 +0300)
committerSabin Rapan <sabrapan@amazon.com>
Wed, 28 Jul 2021 09:51:28 +0000 (12:51 +0300)
The comments on TPM2TSS_GENKEY and CREATE_TPM2_KEY say the former can
only create keys, while the latter can import them too, but we used them
the other way around. This causes the auth-hwtpm test to fail on
machines just with tpm2-tss-engine installed.

Tested on Ubuntu 20.04 with openssl and tpm2-tss.

Signed-off-by: Sabin Rapan <sabin.rapan@gmail.com>
configure.ac

index f636291b717f02fbcd7d0b72d42dcf0b94f1dc05..562c5c38966ff9447420a8303e30635e96295562 100644 (file)
@@ -734,8 +734,8 @@ fi
 
 AM_CONDITIONAL(TEST_HWTPM, [ test "$test_hwtpm" = "yes" ])
 AM_CONDITIONAL(TEST_SWTPM, [ test "$SWTPM_IOCTL" != "" ])
-AM_CONDITIONAL(TEST_TPM2_IMPORT, [ test "$TPM2TSS_GENKEY" != "" ])
-AM_CONDITIONAL(TEST_TPM2_CREATE, [ test "$CREATE_TPM2_KEY" != "" ])
+AM_CONDITIONAL(TEST_TPM2_CREATE, [ test "$TPM2TSS_GENKEY" != "" ])
+AM_CONDITIONAL(TEST_TPM2_IMPORT, [ test "$CREATE_TPM2_KEY" != "" ])
 
 test_pkcs11=
 if test "$pkcs11_support" != ""; then