diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-04-24 22:03:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-24 22:03:06 +0200 |
| commit | 208a59c15fd41f87248a1a981e558acd3de5e47b (patch) | |
| tree | 45f73492212a2c220305ab41bb3c74cd6265efeb /src/shared/tpm2-util.c | |
| parent | 91ce42f008764c3c6d8d72c5fb3b72d0945b7de2 (diff) | |
| parent | 2ed7a221fafb25eea937c4e86fb88ee501dba51e (diff) | |
| download | systemd-208a59c15fd41f87248a1a981e558acd3de5e47b.tar.gz | |
Merge pull request #27113 from keszybz/variable-expansion-rework
Rework serialization of command lines in pid1 and make run not expand variables
Diffstat (limited to 'src/shared/tpm2-util.c')
| -rw-r--r-- | src/shared/tpm2-util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index 86ada60561..3ccbbbcaf9 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -14,6 +14,8 @@ #include "hexdecoct.h" #include "hmac.h" #include "lock-util.h" +#include "log.h" +#include "logarithm.h" #include "memory-util.h" #include "openssl-util.h" #include "parse-util.h" @@ -774,7 +776,7 @@ size_t tpm2_tpms_pcr_selection_weight(const TPMS_PCR_SELECTION *s) { uint32_t mask; tpm2_tpms_pcr_selection_to_mask(s, &mask); - return (size_t)__builtin_popcount(mask); + return popcount(mask); } /* Utility functions for TPML_PCR_SELECTION. */ |