From 90485377c865d59d1f5371960ae60cee3b580421 Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Wed, 16 Oct 2013 16:11:35 -0400 Subject: [PATCH] 4215 pkcs11_tpm botches shared library initialization, murders its friends Reviewed by: Igor Kozhukhov Reviewed by: Garrett D'Amore Approved by: Dan McDonald --- usr/src/lib/pkcs11/pkcs11_tpm/common/api_interface.c | 2 -- usr/src/lib/pkcs11/pkcs11_tpm/common/tpmtok_int.h | 1 - 2 files changed, 3 deletions(-) diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/common/api_interface.c b/usr/src/lib/pkcs11/pkcs11_tpm/common/api_interface.c index 16d5ac9bad..855f6c54dc 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/common/api_interface.c +++ b/usr/src/lib/pkcs11/pkcs11_tpm/common/api_interface.c @@ -1241,8 +1241,6 @@ C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) { - _init(); - PK11_Functions.version.major = VERSION_MAJOR; PK11_Functions.version.minor = VERSION_MINOR; PK11_Functions.C_Initialize = C_Initialize; diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/common/tpmtok_int.h b/usr/src/lib/pkcs11/pkcs11_tpm/common/tpmtok_int.h index 3bb48ea4e1..c63aa0b15d 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/common/tpmtok_int.h +++ b/usr/src/lib/pkcs11/pkcs11_tpm/common/tpmtok_int.h @@ -566,7 +566,6 @@ void CreateXProcLock(void *); int XProcLock(void *); int XProcUnLock(void *); -void _init(void); void loginit(); void logterm(); void logit(int, char *, ...); -- 2.11.4.GIT