diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-19 13:15:42 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-03-12 19:47:44 +0200 |
| commit | b8ccc4133d4adaea81b30537c9a156ae726b2146 (patch) | |
| tree | 745779e6bb3a87372ea5429b6ed731f8708f8b70 /usr/src/lib | |
| parent | 20af54a8dfd25497aa77acb3ad11cf1e91b122e9 (diff) | |
| download | illumos-joyent-b8ccc4133d4adaea81b30537c9a156ae726b2146.tar.gz | |
13519 pkcs11_tpm: symbol 'hPrivateLeafKey' is multiply-defined
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Jason King <jason.brian.king+illumos@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/pkcs11/pkcs11_tpm/common/loadsave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/common/loadsave.c b/usr/src/lib/pkcs11/pkcs11_tpm/common/loadsave.c index 249d6c7946..769897a74e 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/common/loadsave.c +++ b/usr/src/lib/pkcs11/pkcs11_tpm/common/loadsave.c @@ -302,7 +302,7 @@ static char keystore_path[MAXPATHLEN]; static boolean_t keystore_path_initialized = 0; -TSS_HKEY hPrivateLeafKey; +extern TSS_HKEY hPrivateLeafKey; static CK_RV restore_private_token_object(TSS_HCONTEXT, CK_BYTE *, CK_ULONG, OBJECT *); @@ -753,7 +753,7 @@ save_private_token_object(TSS_HCONTEXT hContext, OBJECT *obj) UINT32 obj_data_len_32; UINT32 total_len; UINT32 chunksize, blocks; - char *p = get_tpm_keystore_path(); + char *p = get_tpm_keystore_path(); if (p == NULL) return (CKR_FUNCTION_FAILED); |