Skip to content

Commit 86bf3f1

Browse files
author
Johannes Holland
committed
iwyu: fix includes with mapping file
Signed-off-by: Johannes Holland <johannes.holland@infineon.de>
1 parent de9b15e commit 86bf3f1

File tree

124 files changed

+408
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+408
-409
lines changed

‎src/tss2-esys/esys_crypto_ossl.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // for HAVE_EVP_SM4_CFB
99
#endif
1010

11-
#include <inttypes.h> // for uint8_t, PRIu16
11+
#include <inttypes.h> // for PRIu16
1212
#include <openssl/bn.h> // for BN_free, BN_bin2bn, BN_bn2bin, BN_n...
1313
#include <openssl/crypto.h> // for OSSL_LIB_CTX_free, OSSL_LIB_CTX_new
1414
#include <openssl/ec.h> // for EC_POINT_free, EC_POINT_new, EC_GRO...
@@ -25,9 +25,8 @@
2525
#include <openssl/core_names.h> // for OSSL_PKEY_PARAM_EC_PUB_X, OSSL_PKEY...
2626
#include <openssl/param_build.h> // for OSSL_PARAM_BLD_free, OSSL_PARAM_BLD...
2727
#include <openssl/params.h> // for OSSL_PARAM_free
28-
#include <openssl/types.h> // for BIGNUM, EVP_CIPHER, EVP_CIPHER_CTX
2928
#endif
30-
#include "esys_crypto.h" // for iesys_crypto_hash_get_digest_size
29+
#include "esys_crypto.h" // for OSSL_FREE, iesys_crypto_hash_get_di...
3130
#include "esys_crypto_ossl.h"
3231
#include "tss2_esys.h" // for ESYS_CRYPTO_CONTEXT_BLOB
3332
#include "tss2_mu.h" // for Tss2_MU_TPMS_ECC_POINT_Marshal

‎src/tss2-fapi/api/Fapi_ExportKey.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_put, json_object_to_js...
1212
#include <stdlib.h> // for NULL
1313
#include <string.h> // for memset, strdup
1414

‎src/tss2-fapi/api/Fapi_ExportPolicy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
#include <inttypes.h> // for PRIu16
12-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
12+
#include <json.h> // for json_object_to_json_string_ext
1313
#include <stdbool.h> // for false, true
1414
#include <string.h> // for memset, size_t, NULL
1515

‎src/tss2-fapi/api/Fapi_GetInfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // for PACKAGE_STRING
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_put, json_object_to_js...
1212
#include <string.h> // for memset, strdup, NULL, size_t
1313

1414
#include "fapi_int.h" // for FAPI_CONTEXT, IFAPI_GetInfo, IFAPI...

‎src/tss2-fapi/api/Fapi_GetTpmBlobs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_put, json_objec...
1212
#include <stdint.h> // for uint8_t
1313
#include <stdlib.h> // for malloc, size_t, NULL
1414
#include <string.h> // for memcpy

‎src/tss2-fapi/api/Fapi_Import.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_put, json_tok...
1212
#include <stdint.h> // for uint16_t
1313
#include <stdlib.h> // for NULL, size_t
1414
#include <string.h> // for strncmp, memset, memcpy

‎src/tss2-fapi/api/Fapi_NvExtend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_array_add, json_object...
1212
#include <stdint.h> // for uint8_t
1313
#include <stdlib.h> // for NULL, malloc, size_t
1414
#include <string.h> // for memcpy, memset

‎src/tss2-fapi/api/Fapi_NvIncrement.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object
1212
#include <stdlib.h> // for NULL
1313
#include <string.h> // for memset
1414

‎src/tss2-fapi/api/Fapi_NvSetBits.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
#include <inttypes.h> // for uint64_t, PRIx64
12-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
12+
#include <json.h> // for json_object
1313
#include <stdlib.h> // for NULL
1414
#include <string.h> // for memset
1515

‎src/tss2-fapi/api/Fapi_NvWrite.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object
1212
#include <stdint.h> // for uint8_t
1313
#include <stdlib.h> // for NULL, malloc, size_t
1414
#include <string.h> // for memcpy, memset

‎src/tss2-fapi/api/Fapi_VerifyQuote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_put, json_tokener_parse
1212
#include <stdint.h> // for uint8_t
1313
#include <stdlib.h> // for NULL, size_t, malloc
1414
#include <string.h> // for memset, memcmp, memcpy

‎src/tss2-fapi/fapi_crypto.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <openssl/buffer.h> // for buf_mem_st
1515
#include <openssl/crypto.h> // for OSSL_LIB_CTX_free, OSSL_LIB_CTX_new
1616
#include <openssl/ec.h> // for ECDSA_SIG_free, i2d_ECDSA_SIG, ECDS...
17-
#include <openssl/evp.h> // for EVP_PKEY_type, EVP_PKEY_free, EVP_P...
17+
#include <openssl/evp.h> // for EVP_PKEY_type, EVP_PKEY_free, EVP_PKEY
1818
#include <openssl/obj_mac.h> // for NID_sm2, NID_X9_62_prime192v1, NID_...
1919
#include <openssl/objects.h> // for OBJ_nid2sn, OBJ_txt2nid
2020
#include <openssl/opensslv.h> // for OPENSSL_VERSION_NUMBER
@@ -31,7 +31,6 @@
3131
#include <openssl/core_names.h> // for OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PK...
3232
#include <openssl/param_build.h> // for OSSL_PARAM_BLD_free, OSSL_PARAM_BLD...
3333
#include <openssl/params.h> // for OSSL_PARAM_free
34-
#include <openssl/types.h> // for EVP_PKEY, BIGNUM, BIO, EVP_PKEY_CTX
3534
#endif
3635
#include <openssl/err.h> // for ERR_print_errors_fp
3736

‎src/tss2-fapi/fapi_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef FAPI_INT_H
77
#define FAPI_INT_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
9+
#include <json.h> // for json_object
1010
#include <stdbool.h> // for bool, false, true
1111
#include <stdint.h> // for uint8_t, uint32_t, uint64_t
1212
#include <stdio.h> // for size_t, NULL

‎src/tss2-fapi/fapi_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_put, json_object_t...
1212
#include <stdlib.h> // for free, calloc, malloc
1313
#include <string.h> // for memcpy, strcmp, memset, strlen
1414
#include <strings.h> // for strcasecmp

‎src/tss2-fapi/ifapi_config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "config.h" // for SYSCONFDIR
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
11+
#include <json.h> // for json_object_put, json_object
1212
#include <stdint.h> // for uint8_t
1313
#include <stdlib.h> // for NULL, getenv, size_t
1414
#include <string.h> // for strncmp, strlen, memset, strdup

‎src/tss2-fapi/ifapi_curl.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
#endif
55

66
#include <curl/curl.h> // for curl_easy_strerror, CURLE_OK, curl_ea...
7-
#include <openssl/asn1.h> // for asn1_string_st
87
#include <openssl/bio.h> // for BIO_free, BIO_new_mem_buf
8+
#include <openssl/evp.h> // for X509, ASN1_IA5STRING, X509_CRL, DIST_...
99
#include <openssl/obj_mac.h> // for NID_crl_distribution_points, NID_info...
10+
#include <openssl/opensslv.h> // for OPENSSL_VERSION_NUMBER
1011
#include <openssl/pem.h> // for PEM_read_bio_X509
1112
#include <openssl/safestack.h> // for STACK_OF
1213
#include <openssl/x509.h> // for X509_free, X509_STORE_add_cert, X509_...
@@ -17,8 +18,6 @@
1718

1819
#if OPENSSL_VERSION_NUMBER < 0x30000000L
1920
#include <openssl/aes.h>
20-
#else
21-
#include <openssl/types.h> // for X509, ASN1_IA5STRING, X509_CRL, DIST_...
2221
#endif
2322

2423
#include "fapi_certificates.h" // for root_cert_list

‎src/tss2-fapi/ifapi_eventlog.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "config.h" // IWYU pragma: keep
99
#endif
1010

11-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
1211
#include <stdint.h> // for uint8_t
1312
#include <stdlib.h> // for free
1413
#include <string.h> // for memset, strdup, memcpy
@@ -18,9 +17,9 @@
1817
#include "ifapi_eventlog.h"
1918
#include "ifapi_helpers.h" // for ifapi_asprintf, ifapi_cal...
2019
#include "ifapi_ima_eventlog.h" // for IFAPI_IMA_EVENT, ifapi_re...
21-
#include "ifapi_json_deserialize.h" // for ifapi_json_IFAPI_EVENT_deserialize
22-
#include "ifapi_json_serialize.h" // for ifapi_json_IFAPI_EVENT_se...
20+
#include "ifapi_json_deserialize.h" // for ifapi_json_IFAPI_EVENT_de...
2321
#include "ifapi_json_eventlog_serialize.h" // for ifapi_get_tcg_firmware_ev...
22+
#include "ifapi_json_serialize.h" // for ifapi_json_IFAPI_EVENT_se...
2423
#include "ifapi_macros.h" // for check_not_null, statecase
2524
#include "tpm_json_deserialize.h" // for ifapi_parse_json
2625

‎src/tss2-fapi/ifapi_eventlog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef IFAPI_EVENTLOG_H
77
#define IFAPI_EVENTLOG_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
9+
#include <json.h> // for json_object
1010
#include <stdbool.h> // for bool
1111
#include <stddef.h> // for size_t
1212

‎src/tss2-fapi/ifapi_eventlog_system.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#endif
1010

1111
#include <inttypes.h> // for uintptr_t, uint8_t, int64_t, PRId64
12-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
1312
#include <stdio.h> // for sscanf
1413
#include <stdlib.h> // for calloc
1514
#include <string.h> // for strlen, strncmp, memcmp, strcmp

‎src/tss2-fapi/ifapi_eventlog_system.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#ifndef IFAPI_EVENTLOG_SYSTEM_H
77
#define IFAPI_EVENTLOG_SYSTEM_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
10-
#include <stdbool.h> // for bool
11-
#include <stddef.h> // for size_t
9+
#include <json.h> // for json_object
10+
#include <stdbool.h> // for bool
11+
#include <stddef.h> // for size_t
1212

13-
#include "efi_event.h" // for TCG_EVENT_HEADER2, TCG_DIGEST2, TCG_E...
14-
#include "fapi_types.h" // for UINT8_ARY
15-
#include "tss2_common.h" // for UINT32, BYTE, TSS2_RC
13+
#include "efi_event.h" // for TCG_EVENT_HEADER2, TCG_DIGEST2, TCG_EVENT
14+
#include "fapi_types.h" // for UINT8_ARY
15+
#include "tss2_common.h" // for UINT32, BYTE, TSS2_RC
1616

1717
typedef UINT32 TCG_EVENT_TYPE;
1818

‎src/tss2-fapi/ifapi_get_web_cert.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
#endif
66

77
#include <curl/curl.h> // for curl_easy_cleanup, curl_easy_init
8-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
8+
#include <json.h> // for json_object_get_string, json_objec...
99
#include <openssl/bio.h> // for BIO_new, BIO_free_all, BIO_push
1010
#include <openssl/buffer.h> // for buf_mem_st
1111
#include <openssl/evp.h> // for EVP_DigestUpdate, BIO_f_base64
12+
#include <openssl/opensslv.h> // for OPENSSL_VERSION_NUMBER
1213
#include <openssl/sha.h> // for SHA256_DIGEST_LENGTH
1314
#include <stdbool.h> // for bool, true
1415
#include <stdint.h> // for uint8_t
@@ -18,8 +19,6 @@
1819

1920
#if OPENSSL_VERSION_NUMBER < 0x30000000L
2021
#include <openssl/aes.h>
21-
#else
22-
#include <openssl/types.h> // for X509, ASN1_IA5STRING, X509_CRL, DIST_...
2322
#endif
2423

2524
#include "fapi_int.h" // for FAPI_CONTEXT, VENDOR_AMD, VENDOR_INTC

‎src/tss2-fapi/ifapi_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <errno.h> // for EEXIST, errno
1212
#include <inttypes.h> // for PRIu16, SCNx32, PRIi32, PRIu32
13-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
1413
#include <stdarg.h> // for va_list, va_end, va_copy, va_start
1514
#include <stdio.h> // for sscanf, vsnprintf, vsprintf, vas...
1615
#include <stdlib.h> // for malloc, calloc, free
@@ -27,6 +26,7 @@
2726
#include "ifapi_json_serialize.h" // for ifapi_json_FAPI_QUOTE_INFO_seria...
2827
#include "ifapi_macros.h" // for strdup_check, goto_if_error2
2928
#include "ifapi_policy.h" // for ifapi_compute_policy_digest
29+
#include "linkhash.h" // for lh_entry
3030
#include "tpm_json_deserialize.h" // for ifapi_parse_json
3131
#include "tss2_mu.h" // for Tss2_MU_TPMI_ALG_HASH_Marshal
3232

‎src/tss2-fapi/ifapi_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef IFAPI_HELPERS_H
77
#define IFAPI_HELPERS_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
9+
#include <json.h> // for json_object
1010
#include <stdbool.h> // for bool
1111
#include <stddef.h> // for size_t
1212
#include <stdint.h> // for uint8_t

‎src/tss2-fapi/ifapi_ima_eventlog.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
#endif
1010

1111
#include <inttypes.h> // for PRIu32
12-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
13-
#include <openssl/evp.h> // for EVP_MD, EVP_get_digestbyname, EVP_MD_size
12+
#include <openssl/evp.h> // for EVP_get_digestbyname, EVP_MD, EVP_...
1413
#include <stdbool.h> // for bool, false, true
1514
#include <stdio.h> // for fread, fclose, FILE, fopen, sprintf
1615
#include <stdlib.h> // for calloc, malloc

‎src/tss2-fapi/ifapi_ima_eventlog.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
#ifndef IFAPI_IMA_EVENTLOG_H
77
#define IFAPI_IMA_EVENTLOG_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
10-
#include <stdbool.h> // for bool
11-
#include <stddef.h> // for size_t
12-
#include <stdint.h> // for uint32_t
9+
#include <json.h> // for json_object
10+
#include <stdbool.h> // for bool
11+
#include <stddef.h> // for size_t
12+
#include <stdint.h> // for uint32_t
1313

14-
#include "fapi_types.h" // for UINT8_ARY
15-
#include "tss2_common.h" // for UINT32, TSS2_RC, UINT8
16-
#include "tss2_tpm2_types.h" // for TPM2_SHA512_DIGEST_SIZE, TPMI_ALG_HASH
14+
#include "fapi_types.h" // for UINT8_ARY
15+
#include "tss2_common.h" // for UINT32, TSS2_RC, UINT8
16+
#include "tss2_tpm2_types.h" // for TPM2_SHA512_DIGEST_SIZE, TPMI_ALG_HASH
1717

1818
/* Defines from kernel ima.h" */
1919
#define TCG_EVENT_NAME_LEN_MAX 255

‎src/tss2-fapi/ifapi_json_deserialize.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#endif
1010

1111
#include <inttypes.h> // for int64_t, uint8_t, PRId64
12-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
1312
#include <stdio.h> // for NULL, size_t, sscanf
1413
#include <stdlib.h> // for calloc, malloc
1514
#include <string.h> // for memset, strlen, strdup

‎src/tss2-fapi/ifapi_json_deserialize.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#ifndef IFAPI_JSON_DESERIALIZE_H
77
#define IFAPI_JSON_DESERIALIZE_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
10-
#include <stdbool.h> // for bool
9+
#include <json.h> // for json_object
10+
#include <stdbool.h> // for bool
1111

12-
#include "ifapi_eventlog.h" // for IFAPI_EVENT_TYPE, FAPI_QUOTE_INFO
13-
#include "ifapi_keystore.h" // for IFAPI_KEY, IFAPI_EXT_PUB_KEY, IFAPI_H...
14-
#include "ifapi_macros.h" // for return_if_error2
15-
#include "tss2_common.h" // for TSS2_RC, UINT32
12+
#include "ifapi_eventlog.h" // for IFAPI_EVENT_TYPE, FAPI_QUOTE_INFO, IFAPI...
13+
#include "ifapi_keystore.h" // for IFAPI_KEY, IFAPI_EXT_PUB_KEY, IFAPI_HIER...
14+
#include "ifapi_macros.h" // for return_if_error2
15+
#include "tss2_common.h" // for TSS2_RC, UINT32
1616

1717
#define YES 1
1818
#define NO 0

‎src/tss2-fapi/ifapi_json_eventlog_deserialize.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef IFAPI_JSON_EVENTLOG_DESERIALIZE_H
77
#define IFAPI_JSON_EVENTLOG_DESERIALIZE_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
9+
#include <json.h> // for json_object
1010
#include <stddef.h> // for size_t
1111
#include <stdint.h> // for uint8_t
1212

‎src/tss2-fapi/ifapi_json_eventlog_serialize.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
#include <errno.h> // for errno
1212
#include <inttypes.h> // for PRIu8, PRIu64, PRIu16, PRIu32
13-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
1413
#include <stdio.h> // for fclose, fread, fopen, sprintf, FILE
1514
#include <stdlib.h> // for free, calloc, malloc, realloc
1615
#include <string.h> // for strlen, memcpy, strerror, memset
17-
#include <uchar.h> // for char16_t, c16rtomb, mbstate_t
16+
#include <uchar.h> // for char16_t, c16rtomb
1817
#include <uuid/uuid.h> // for uuid_unparse_lower, uuid_t
18+
#include <wchar.h> // for mbstate_t
1919

2020
#include "efi_event.h" // for TCG_EVENT2, TCG_SPECID_EVENT, UEF...
2121
#include "fapi_crypto.h" // for ifapi_hash_get_digest_size

‎src/tss2-fapi/ifapi_json_eventlog_serialize.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#ifndef IFAPI_JSON_EVENTLOG_SERIALIZE_H
77
#define IFAPI_JSON_EVENTLOG_SERIALIZE_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
10-
#include <stdbool.h> // for bool
11-
#include <stddef.h> // for size_t
12-
#include <stdint.h> // for uint32_t
9+
#include <json.h> // for json_object
10+
#include <stdbool.h> // for bool
11+
#include <stddef.h> // for size_t
12+
#include <stdint.h> // for uint32_t
1313

14-
#include "tss2_common.h" // for TSS2_RC, UINT8
15-
#include "tss2_tpm2_types.h" // for TPM2_MAX_PCRS
14+
#include "tss2_common.h" // for TSS2_RC, UINT8
15+
#include "tss2_tpm2_types.h" // for TPM2_MAX_PCRS
1616

1717
typedef struct {
1818
json_object *jso_event_list;

‎src/tss2-fapi/ifapi_json_serialize.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#endif
1010

1111
#include <inttypes.h> // for PRIx32, uint8_t
12-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
1312
#include <stdbool.h> // for true
1413
#include <stdio.h> // for NULL, size_t, sprintf
1514
#include <stdlib.h> // for malloc

‎src/tss2-fapi/ifapi_json_serialize.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef IFAPI_JSON_SERIALIZE_H
77
#define IFAPI_JSON_SERIALIZE_H
88

9-
#include <json-c/json.h> // for json_object, json_object_put, json_object_to_js...
9+
#include <json.h> // for json_object
1010

1111
#include "fapi_int.h" // for IFAPI_CAP_INFO, IFAPI_INFO
1212
#include "fapi_types.h" // for UINT8_ARY

0 commit comments

Comments
 (0)