65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
|
From 26acaa4bf064f7608dec08cff4d23769b167dced Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau@redhat.com>
|
||
|
|
Date: Wed, 20 Mar 2013 14:07:49 +0100
|
||
|
|
Subject: [PATCH 224/241] libcacard: remove default libcoolkey loading
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Use only the modules defined in the NSS database.
|
||
|
|
|
||
|
|
Signed-off-by: Marc-André Lureau <mlureau@redhat.com>
|
||
|
|
Reviewed-by: Alon Levy <alevy@redhat.com>
|
||
|
|
(cherry picked from commit ad2181f2b612cd8bf0a790faa2a1b51559f7234b)
|
||
|
|
---
|
||
|
|
libcacard/vcard_emul_nss.c | 17 +----------------
|
||
|
|
1 file changed, 1 insertion(+), 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
|
||
|
|
index 6b1ca8a..9ba80fb 100644
|
||
|
|
--- a/libcacard/vcard_emul_nss.c
|
||
|
|
+++ b/libcacard/vcard_emul_nss.c
|
||
|
|
@@ -870,7 +870,7 @@ VCardEmulError
|
||
|
|
vcard_emul_init(const VCardEmulOptions *options)
|
||
|
|
{
|
||
|
|
SECStatus rv;
|
||
|
|
- PRBool ret, has_readers = PR_FALSE, need_coolkey_module;
|
||
|
|
+ PRBool ret, has_readers = PR_FALSE;
|
||
|
|
VReader *vreader;
|
||
|
|
VReaderEmul *vreader_emul;
|
||
|
|
SECMODListLock *module_lock;
|
||
|
|
@@ -983,30 +983,15 @@ vcard_emul_init(const VCardEmulOptions *options)
|
||
|
|
/* make sure we have some PKCS #11 module loaded */
|
||
|
|
module_lock = SECMOD_GetDefaultModuleListLock();
|
||
|
|
module_list = SECMOD_GetDefaultModuleList();
|
||
|
|
- need_coolkey_module = !has_readers;
|
||
|
|
SECMOD_GetReadLock(module_lock);
|
||
|
|
for (mlp = module_list; mlp; mlp = mlp->next) {
|
||
|
|
SECMODModule *module = mlp->module;
|
||
|
|
if (module_has_removable_hw_slots(module)) {
|
||
|
|
- need_coolkey_module = PR_FALSE;
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
SECMOD_ReleaseReadLock(module_lock);
|
||
|
|
|
||
|
|
- if (need_coolkey_module) {
|
||
|
|
- SECMODModule *module;
|
||
|
|
- module = SECMOD_LoadUserModule(
|
||
|
|
- (char *)"library=libcoolkeypk11.so name=Coolkey",
|
||
|
|
- NULL, PR_FALSE);
|
||
|
|
- if (module == NULL) {
|
||
|
|
- return VCARD_EMUL_FAIL;
|
||
|
|
- }
|
||
|
|
- SECMOD_DestroyModule(module); /* free our reference, Module will still
|
||
|
|
- * be on the list.
|
||
|
|
- * until we destroy it */
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
/* now examine all the slots, finding which should be readers */
|
||
|
|
/* We should control this with options. For now we mirror out any
|
||
|
|
* removable hardware slot */
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|