head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.50 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.48 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.46 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.44 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.42 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.40 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.38 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.36 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.34 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.32 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.30 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.28 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.26 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.24 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.22 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.20 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.18 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.16 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.14 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.12 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.10 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.8 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.6 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.4 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.2 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.1.1.1.0.104 pkgsrc-2019Q4-base:1.1.1.1 pkgsrc-2019Q3:1.1.1.1.0.100 pkgsrc-2019Q3-base:1.1.1.1 pkgsrc-2019Q2:1.1.1.1.0.98 pkgsrc-2019Q2-base:1.1.1.1 pkgsrc-2019Q1:1.1.1.1.0.96 pkgsrc-2019Q1-base:1.1.1.1 pkgsrc-2018Q4:1.1.1.1.0.94 pkgsrc-2018Q4-base:1.1.1.1 pkgsrc-2018Q3:1.1.1.1.0.92 pkgsrc-2018Q3-base:1.1.1.1 pkgsrc-2018Q2:1.1.1.1.0.90 pkgsrc-2018Q2-base:1.1.1.1 pkgsrc-2018Q1:1.1.1.1.0.88 pkgsrc-2018Q1-base:1.1.1.1 pkgsrc-2017Q4:1.1.1.1.0.86 pkgsrc-2017Q4-base:1.1.1.1 pkgsrc-2017Q3:1.1.1.1.0.84 pkgsrc-2017Q3-base:1.1.1.1 pkgsrc-2017Q2:1.1.1.1.0.80 pkgsrc-2017Q2-base:1.1.1.1 pkgsrc-2017Q1:1.1.1.1.0.78 pkgsrc-2017Q1-base:1.1.1.1 pkgsrc-2016Q4:1.1.1.1.0.76 pkgsrc-2016Q4-base:1.1.1.1 pkgsrc-2016Q3:1.1.1.1.0.74 pkgsrc-2016Q3-base:1.1.1.1 pkgsrc-2016Q2:1.1.1.1.0.72 pkgsrc-2016Q2-base:1.1.1.1 pkgsrc-2016Q1:1.1.1.1.0.70 pkgsrc-2016Q1-base:1.1.1.1 pkgsrc-2015Q4:1.1.1.1.0.68 pkgsrc-2015Q4-base:1.1.1.1 pkgsrc-2015Q3:1.1.1.1.0.66 pkgsrc-2015Q3-base:1.1.1.1 pkgsrc-2015Q2:1.1.1.1.0.64 pkgsrc-2015Q2-base:1.1.1.1 pkgsrc-2015Q1:1.1.1.1.0.62 pkgsrc-2015Q1-base:1.1.1.1 pkgsrc-2014Q4:1.1.1.1.0.60 pkgsrc-2014Q4-base:1.1.1.1 pkgsrc-2014Q3:1.1.1.1.0.58 pkgsrc-2014Q3-base:1.1.1.1 pkgsrc-2014Q2:1.1.1.1.0.56 pkgsrc-2014Q2-base:1.1.1.1 pkgsrc-2014Q1:1.1.1.1.0.54 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.52 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.50 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.48 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.46 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.44 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.42 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.40 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.38 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.36 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.34 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.32 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.30 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.28 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-2010Q3:1.1.1.1.0.26 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.24 pkgsrc-2010Q2-base:1.1.1.1 pkgsrc-2010Q1:1.1.1.1.0.22 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.20 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-2009Q3:1.1.1.1.0.18 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-2009Q2:1.1.1.1.0.16 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-2009Q1:1.1.1.1.0.14 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.12 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.10 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.8 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.6 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.4 pkgsrc-2008Q1:1.1.1.1.0.2 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2020.03.26.21.50.44; author joerg; state Exp; branches; next 1.1; commitid CplgaV9meBzSvX1C; 1.1 date 2008.03.04.11.33.02; author shannonjr; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.03.04.11.33.02; author shannonjr; state Exp; branches; next ; desc @@ 1.2 log @Rename log to not conflict with math.h. @ text @$NetBSD: patch-ac,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $ Avoid name conflict with math.h's log. --- src/coolkey/coolkey.cpp.orig 2007-02-14 19:54:01.000000000 +0000 +++ src/coolkey/coolkey.cpp @@@@ -34,11 +34,13 @@@@ #include "cky_base.h" #include "params.h" +#ifndef NULL #define NULL 0 +#endif /* static module data -------------------------------- */ -static Log *log = NULL; +static Log *mylog = NULL; static SlotList *slotList = NULL; @@@@ -86,11 +88,11 @@@@ dumpTemplates(CK_ATTRIBUTE_PTR pTemplate for (i = 0; i < ulCount; ++i) { CK_ATTRIBUTE_PTR pT = pTemplate + i; if (pT->pValue && pT->ulValueLen == 4) { - log->log( + mylog->log( "template [%02lu] type: %04lx, pValue: %08lx, ulValueLen: %08lx, value: %lu\n", i, pT->type, pT->pValue, pT->ulValueLen, *(CK_ULONG_PTR)pT->pValue); } else - log->log("template [%02lu] type: %04lx, pValue: %08lx, ulValueLen: %08lx\n", + mylog->log("template [%02lu] type: %04lx, pValue: %08lx, ulValueLen: %08lx\n", i, pT->type, pT->pValue, pT->ulValueLen); } } @@@@ -101,7 +103,7 @@@@ dumpTemplates(CK_ATTRIBUTE_PTR pTemplate #define NOTSUPPORTED(name, args) \ CK_RV name args \ { \ - log->log(#name " called (notSupported)\n"); \ + mylog->log(#name " called (notSupported)\n"); \ return CKR_FUNCTION_NOT_SUPPORTED; \ } @@@@ -112,11 +114,11 @@@@ CK_RV name dec_args \ return CKR_CRYPTOKI_NOT_INITIALIZED; \ } \ try { \ - log->log(#name " called\n"); \ + mylog->log(#name " called\n"); \ slotList->name2 use_args ; \ return CKR_OK; \ } catch(PKCS11Exception& e) { \ - e.log(log); \ + e.log(mylog); \ return e.getCRV(); \ } \ } @@@@ -227,21 +229,21 @@@@ C_Initialize(CK_VOID_PTR pInitArgs) char * logFileName = getenv("COOL_KEY_LOG_FILE"); if (logFileName) { if (strcmp(logFileName,"SYSLOG") == 0) { - log = new SysLog(); + mylog = new SysLog(); } else { - log = new FileLog(logFileName); + mylog = new FileLog(logFileName); } } else { - log = new DummyLog(); + mylog = new DummyLog(); } - log->log("Initialize called, hello %d\n", 5); + mylog->log("Initialize called, hello %d\n", 5); CKY_SetName("coolkey"); - slotList = new SlotList(log); + slotList = new SlotList(mylog); initialized = TRUE; return CKR_OK; } catch(PKCS11Exception &e) { - if( log ) - e.log(log); + if( mylog ) + e.log(mylog); return e.getReturnValue(); } } @@@@ -254,7 +256,7 @@@@ C_Finalize(CK_VOID_PTR pReserved) } // XXX cleanup all data structures !!! //delete sessionManager; - log->log("Finalizing...\n"); + mylog->log("Finalizing...\n"); // don't race the setting of finalizing. If C_WaitEvent gets passed // the finalizing call first, we know it will set waitEvent before // we can get the lock, so we only need to protect setting finalizing @@@@ -272,7 +274,7 @@@@ C_Finalize(CK_VOID_PTR pReserved) } } delete slotList; - delete log; + delete mylog; finalizeLock.getLock(); finalizing = FALSE; initialized = FALSE; @@@@ -287,7 +289,7 @@@@ C_GetInfo(CK_INFO_PTR p) if( ! initialized ) { return CKR_CRYPTOKI_NOT_INITIALIZED; } - log->log("C_GetInfo called\n"); + mylog->log("C_GetInfo called\n"); ckInfo.manufacturerID[31] = ' '; ckInfo.libraryDescription[31] = ' '; *p = ckInfo; @@@@ -302,12 +304,12 @@@@ C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("Called C_GetSlotInfo\n"); + mylog->log("Called C_GetSlotInfo\n"); slotList->validateSlotID(slotID); return slotList->getSlot( slotIDToIndex(slotID))->getSlotInfo(pSlotInfo); } catch( PKCS11Exception &excep ) { - excep.log(log); + excep.log(mylog); return excep.getCRV(); } } @@@@ -319,12 +321,12 @@@@ C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOK return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_GetTokenInfo called\n"); + mylog->log("C_GetTokenInfo called\n"); slotList->validateSlotID(slotID); return slotList->getSlot( slotIDToIndex(slotID))->getTokenInfo(pTokenInfo); } catch( PKCS11Exception &excep ) { - excep.log(log); + excep.log(mylog); return excep.getCRV(); } } @@@@ -339,7 +341,7 @@@@ C_GetMechanismList(CK_SLOT_ID slotID, CK try { CK_RV rv = CKR_OK; - log->log("C_GetMechanismList called\n"); + mylog->log("C_GetMechanismList called\n"); if( pulCount == NULL ) { throw PKCS11Exception(CKR_ARGUMENTS_BAD); } @@@@ -362,11 +364,11 @@@@ C_GetMechanismList(CK_SLOT_ID slotID, CK *pulCount = numMechanisms; - log->log("C_GetMechanismList returning %d\n", rv); + mylog->log("C_GetMechanismList returning %d\n", rv); return rv; } catch(PKCS11Exception &excep ) { - excep.log(log); + excep.log(mylog); return excep.getCRV(); } @@@@ -380,7 +382,7 @@@@ C_GetMechanismInfo(CK_SLOT_ID slotID, CK return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_GetMechanismInfo called\n"); + mylog->log("C_GetMechanismInfo called\n"); if( pInfo == NULL ) { throw PKCS11Exception(CKR_ARGUMENTS_BAD); } @@@@ -392,14 +394,14 @@@@ C_GetMechanismInfo(CK_SLOT_ID slotID, CK for(unsigned int i=0; i < numMechanisms; ++i ) { if( mechanismList[i].mech == type ) { *pInfo = mechanismList[i].info; - log->log("C_GetMechanismInfo got info about %d\n", type); + mylog->log("C_GetMechanismInfo got info about %d\n", type); return CKR_OK; } } - log->log("C_GetMechanismInfo failed to find info about %d\n", type); + mylog->log("C_GetMechanismInfo failed to find info about %d\n", type); return CKR_MECHANISM_INVALID; // mechanism not in the list } catch(PKCS11Exception &e) { - e.log(log); + e.log(mylog); return e.getCRV(); } } @@@@ -412,7 +414,7 @@@@ C_OpenSession(CK_SLOT_ID slotID, CK_FLAG return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_OpenSession called\n"); + mylog->log("C_OpenSession called\n"); slotList->validateSlotID(slotID); #ifdef LATER // the CSP isn't setting this bit right now. if( ! (flags & CKF_SERIAL_SESSION) ) { @@@@ -430,7 +432,7 @@@@ C_OpenSession(CK_SLOT_ID slotID, CK_FLAG return CKR_OK; } catch(PKCS11Exception &e) { - e.log(log); + e.log(mylog); return e.getCRV(); } } @@@@ -442,13 +444,13 @@@@ C_CloseSession(CK_SESSION_HANDLE hSessio return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_CloseSession(0x%x) called\n", hSession); + mylog->log("C_CloseSession(0x%x) called\n", hSession); // !!!XXX Hack // If nothing else, we need to logout the token when all // its sessions are closed. return CKR_OK; } catch(PKCS11Exception &e) { - e.log(log); + e.log(mylog); return e.getCRV(); } } @@@@ -460,14 +462,14 @@@@ C_CloseAllSessions(CK_SLOT_ID slotID) return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_CloseAllSessions(0x%x) called\n", slotID); + mylog->log("C_CloseAllSessions(0x%x) called\n", slotID); slotList->validateSlotID(slotID); // !!!XXX Hack // If nothing else, we need to logout the token when all // its sessions are closed. return CKR_OK; } catch(PKCS11Exception &e) { - e.log(log); + e.log(mylog); return e.getCRV(); } } @@@@ -481,7 +483,7 @@@@ C_FindObjectsInit(CK_SESSION_HANDLE hSes return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_FindObjectsInit called, %lu templates\n", ulCount); + mylog->log("C_FindObjectsInit called, %lu templates\n", ulCount); dumpTemplates(pTemplate, ulCount); if( pTemplate == NULL && ulCount != 0 ) { @@@@ -490,7 +492,7 @@@@ C_FindObjectsInit(CK_SESSION_HANDLE hSes slotList->findObjectsInit(hSession, pTemplate, ulCount); return CKR_OK; } catch(PKCS11Exception &e) { - e.log(log); + e.log(mylog); return e.getCRV(); } } @@@@ -504,22 +506,22 @@@@ C_FindObjects(CK_SESSION_HANDLE hSession return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_FindObjects called, max objects = %lu\n", ulMaxObjectCount ); + mylog->log("C_FindObjects called, max objects = %lu\n", ulMaxObjectCount ); if( phObject == NULL && ulMaxObjectCount != 0 ) { throw PKCS11Exception(CKR_ARGUMENTS_BAD); } slotList->findObjects(hSession, phObject, ulMaxObjectCount, pulObjectCount); count = *pulObjectCount; - log->log("returned %lu objects:", count ); + mylog->log("returned %lu objects:", count ); CK_ULONG i; for (i = 0; i < count; ++i) { - log->log(" 0x%08lx", phObject[i]); + mylog->log(" 0x%08lx", phObject[i]); } - log->log("\n" ); + mylog->log("\n" ); return CKR_OK; } catch(PKCS11Exception &e) { - e.log(log); + e.log(mylog); return e.getCRV(); } } @@@@ -542,7 +544,7 @@@@ C_Login(CK_SESSION_HANDLE hSession, CK_U return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_Login called\n"); + mylog->log("C_Login called\n"); if( userType != CKU_USER ) { throw PKCS11Exception(CKR_USER_TYPE_INVALID); } @@@@ -552,7 +554,7 @@@@ C_Login(CK_SESSION_HANDLE hSession, CK_U slotList->login(hSession, pPin, ulPinLen); return CKR_OK; } catch(PKCS11Exception &e) { - e.log(log); + e.log(mylog); return e.getCRV(); } } @@@@ -566,7 +568,7 @@@@ C_GetAttributeValue(CK_SESSION_HANDLE hS return CKR_CRYPTOKI_NOT_INITIALIZED; } try { - log->log("C_GetAttributeValue called, %lu templates for object 0x%08lx\n", ulCount, hObject); + mylog->log("C_GetAttributeValue called, %lu templates for object 0x%08lx\n", ulCount, hObject); dumpTemplates(pTemplate, ulCount); if( pTemplate == NULL && ulCount != 0 ) { throw PKCS11Exception(CKR_ARGUMENTS_BAD); @@@@ -576,7 +578,7 @@@@ C_GetAttributeValue(CK_SESSION_HANDLE hS return CKR_OK; } catch(PKCS11Exception& e) { CK_RV rv = e.getCRV(); - e.log(log); + e.log(mylog); if (rv == CKR_ATTRIBUTE_TYPE_INVALID || rv == CKR_BUFFER_TOO_SMALL) { dumpTemplates(pTemplate, ulCount); @@@@ -607,12 +609,12 @@@@ C_WaitForSlotEvent(CK_FLAGS flags, CK_SL waitEvent = TRUE; finalizeLock.releaseLock(); try { - log->log("C_WaitForSlotEvent called\n"); + mylog->log("C_WaitForSlotEvent called\n"); slotList->waitForSlotEvent(flags, pSlot, pReserved); waitEvent = FALSE; return CKR_OK; } catch(PKCS11Exception& e) { - e.log(log); + e.log(mylog); waitEvent = FALSE; return e.getCRV(); } @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 3 --- ./src/coolkey/coolkey.cpp.orig 2007-02-14 12:54:01.000000000 -0700 +++ ./src/coolkey/coolkey.cpp @@@@ -34,7 +34,9 @@@@ d17 326 @ 1.1.1.1 log @Provides driver support for the CoolKey and Common Access Card (CAC) smart card used in a Public Key Infrastructure (PKI). The libpkcs11 module allows use of Smart Cards in applications that use mozilla Network Security Services (NSS). @ text @@