diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2023-06-29 10:03:26 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2023-06-29 10:07:27 -0400 |
| commit | a813f3db695d0d5d889474d203722d9f9641998b (patch) | |
| tree | 2d93a4260c9864955fc6fa4fe70a3c98fb4e2919 | |
| parent | 504ef29ddb545487d77934fb4f93ab4ab24e1347 (diff) | |
| download | openssl_tpm2_engine-a813f3db695d0d5d889474d203722d9f9641998b.tar.gz | |
configure.ac: always use the reference tpm if available
The current formulation of the if clause would use swtpm first if
found and then the ibmswtpm2. Since the latter is the reference
implementation and the former has deviated from it to the extent that
some tests have to be skipped to prevent spurious failures, always
prefer testing with the reference implementation.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7234bb4..6350fc7 100644 --- a/configure.ac +++ b/configure.ac @@ -154,11 +154,11 @@ AC_SUBST(SHREXT) TSSTYPE=$tsslibs AC_SUBST(TSSTYPE) -if test -x "${SWTPM}" -a -x "${SWTPM_IOCTL}"; then +if test -x "${TPMSERVER}"; then + testtpm=tpm_server +elif test -x "${SWTPM}" -a -x "${SWTPM_IOCTL}"; then testtpm=swtpm unset TPMSERVER -elif test -x "${TPMSERVER}"; then - testtpm=tpm_server else testtpm= fi |