ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #133395 from baloo/baloo/tpm2-tss/dlopen-abrmd-support

Browse Source 
tpm2-tss: fix support for abrmd
This commit is contained in:
Artturi 2021-09-07 07:20:02 +03:00 committed by GitHub
commit 6ef6ac1f16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 211 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/tpm2-tss/default.nix
View File

@ -38,9 +38,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/tss2-tcti/tctildr-dl.c \
--replace '@PREFIX@' $out/lib/
substituteInPlace ./test/unit/tctildr-dl.c \
--replace ', "libtss2' ", \"$out/lib/libtss2" \
--replace ', "foo' ", \"$out/lib/foo" \
--replace ', TEST_TCTI_NAME' ", \"$out/lib/\"TEST_TCTI_NAME"
--replace '@PREFIX@' $out/lib
'';
configureFlags = [

234
pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch
View File

@ -1,12 +1,16 @@
diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c
index b364695c..b13be3ef 100644
index b364695c..d026de71 100644
--- a/src/tss2-tcti/tctildr-dl.c
+++ b/src/tss2-tcti/tctildr-dl.c
@@ -85,7 +85,15 @@ handle_from_name(const char *file,
if (handle == NULL) {
return TSS2_TCTI_RC_BAD_REFERENCE;
@@ -116,6 +116,50 @@ handle_from_name(const char *file,
return TSS2_TCTI_RC_BAD_VALUE;
}
- *handle = dlopen(file, RTLD_NOW);
*handle = dlopen(file_xfrm, RTLD_NOW);
+ if (*handle != NULL) {
+ return TSS2_RC_SUCCESS;
+ } else {
+ LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror());
+ }
+ size = snprintf(file_xfrm,
+ sizeof (file_xfrm),
+ "@PREFIX@%s",
@ -16,24 +20,206 @@ index b364695c..b13be3ef 100644
+ return TSS2_TCTI_RC_BAD_VALUE;
+ }
+ *handle = dlopen(file_xfrm, RTLD_NOW);
if (*handle != NULL) {
return TSS2_RC_SUCCESS;
} else {
@@ -94,7 +102,7 @@ handle_from_name(const char *file,
/* 'name' alone didn't work, try libtss2-tcti-<name>.so.0 */
size = snprintf(file_xfrm,
sizeof (file_xfrm),
- TCTI_NAME_TEMPLATE_0,
+ if (*handle != NULL) {
+ return TSS2_RC_SUCCESS;
+ } else {
+ LOG_DEBUG("Could not load TCTI file: \"%s\": %s", file, dlerror());
+ }
+ /* 'name' alone didn't work, try libtss2-tcti-<name>.so.0 */
+ size = snprintf(file_xfrm,
+ sizeof (file_xfrm),
+ "@PREFIX@" TCTI_NAME_TEMPLATE_0,
file);
if (size >= sizeof (file_xfrm)) {
LOG_ERROR("TCTI name truncated in transform.");
@@ -109,7 +117,7 @@ handle_from_name(const char *file,
/* libtss2-tcti-<name>.so.0 didn't work, try libtss2-tcti-<name>.so */
size = snprintf(file_xfrm,
sizeof (file_xfrm),
- TCTI_NAME_TEMPLATE,
+ file);
+ if (size >= sizeof (file_xfrm)) {
+ LOG_ERROR("TCTI name truncated in transform.");
+ return TSS2_TCTI_RC_BAD_VALUE;
+ }
+ *handle = dlopen(file_xfrm, RTLD_NOW);
+ if (*handle != NULL) {
+ return TSS2_RC_SUCCESS;
+ } else {
+ LOG_DEBUG("Could not load TCTI file \"%s\": %s", file, dlerror());
+ }
+ /* libtss2-tcti-<name>.so.0 didn't work, try libtss2-tcti-<name>.so */
+ size = snprintf(file_xfrm,
+ sizeof (file_xfrm),
+ "@PREFIX@" TCTI_NAME_TEMPLATE,
file);
if (size >= sizeof (file_xfrm)) {
LOG_ERROR("TCTI name truncated in transform.");
+ file);
+ if (size >= sizeof (file_xfrm)) {
+ LOG_ERROR("TCTI name truncated in transform.");
+ return TSS2_TCTI_RC_BAD_VALUE;
+ }
+ *handle = dlopen(file_xfrm, RTLD_NOW);
if (*handle == NULL) {
LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror());
return TSS2_TCTI_RC_NOT_SUPPORTED;
diff --git a/test/unit/tctildr-dl.c b/test/unit/tctildr-dl.c
index 873a4531..c17b939e 100644
--- a/test/unit/tctildr-dl.c
+++ b/test/unit/tctildr-dl.c
@@ -223,6 +223,18 @@ test_get_info_default_success (void **state)
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+
expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, HANDLE);
@@ -255,6 +267,18 @@ test_get_info_default_info_fail (void **state)
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+
expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, HANDLE);
@@ -407,6 +431,15 @@ test_tcti_fail_all (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
/* Skip over libtss2-tcti-tabrmd.so */
expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0");
@@ -418,6 +451,15 @@ test_tcti_fail_all (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-tabrmd.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
/* Skip over libtss2-tcti-device.so, /dev/tpmrm0 */
expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0");
@@ -429,6 +471,15 @@ test_tcti_fail_all (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
/* Skip over libtss2-tcti-device.so, /dev/tpm0 */
expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0");
@@ -440,6 +491,15 @@ test_tcti_fail_all (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
/* Skip over libtss2-tcti-swtpm.so */
expect_string(__wrap_dlopen, filename, "libtss2-tcti-swtpm.so.0");
@@ -451,6 +511,15 @@ test_tcti_fail_all (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-swtpm.so.0.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-swtpm.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
/* Skip over libtss2-tcti-mssim.so */
expect_string(__wrap_dlopen, filename, "libtss2-tcti-mssim.so.0");
@@ -462,6 +531,15 @@ test_tcti_fail_all (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-mssim.so.0.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-mssim.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
TSS2_RC r;
TSS2_TCTI_CONTEXT *tcti;
@@ -490,6 +568,15 @@ test_info_from_name_handle_fail (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
TSS2_RC rc = info_from_name ("foo", &info, &data);
assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED);
@@ -606,6 +693,15 @@ test_tctildr_get_info_from_name (void **state)
expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so");
expect_value(__wrap_dlopen, flags, RTLD_NOW);
will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so");
+ expect_value(__wrap_dlopen, flags, RTLD_NOW);
+ will_return(__wrap_dlopen, NULL);
TSS2_RC rc = tctildr_get_info ("foo", &info, &data);
assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED);