зеркало из https://github.com/mozilla/gecko-dev.git
the device API is not public, so move:
NSSModule_ ==> nssModule_ NSSSlot_ ==> nssSlot_ NSSToken_ ==> nssToken Functions which should be public can be changed individually.
This commit is contained in:
mcgreer%netscape.com
Родитель
d87d13f7f6
Коммит
4575248245
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.2 $ $Date: 2001/09/18 20:54:28 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.3 $ $Date: 2001/09/19 21:47:22 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef PKIT_H
|
||||
|
|
@ -76,7 +76,7 @@ NSS_IMPLEMENT_DATA const NSSItem
|
|||
g_ck_class_privkey = { (CK_VOID_PTR)&s_class_privkey, sizeof(s_class_privkey) };
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSCKObject_GetAttributes
|
||||
nssCKObject_GetAttributes
|
||||
(
|
||||
CK_OBJECT_HANDLE object,
|
||||
CK_ATTRIBUTE_PTR obj_template,
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#define CKHELPER_H
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CKHELPER_CVS_ID[] = "@(#) $RCSfile: ckhelper.h,v $ $Revision: 1.2 $ $Date: 2001/09/18 20:54:28 $ $Name: $";
|
||||
static const char CKHELPER_CVS_ID[] = "@(#) $RCSfile: ckhelper.h,v $ $Revision: 1.3 $ $Date: 2001/09/19 21:47:23 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef NSSCKT_H
|
||||
|
|
@ -77,7 +77,7 @@ NSS_EXTERN_DATA const NSSItem g_ck_class_privkey;
|
|||
|
||||
/* Get an array of attributes from an object. */
|
||||
NSS_EXTERN PRStatus
|
||||
NSSCKObject_GetAttributes
|
||||
nssCKObject_GetAttributes
|
||||
(
|
||||
CK_OBJECT_HANDLE object,
|
||||
CK_ATTRIBUTE_PTR obj_template,
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#define DEV_H
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char DEV_CVS_ID[] = "@(#) $RCSfile: dev.h,v $ $Revision: 1.4 $ $Date: 2001/09/19 21:37:20 $ $Name: $";
|
||||
static const char DEV_CVS_ID[] = "@(#) $RCSfile: dev.h,v $ $Revision: 1.5 $ $Date: 2001/09/19 21:47:23 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef DEVT_H
|
||||
|
|
@ -60,11 +60,6 @@ static const char DEV_CVS_ID[] = "@(#) $RCSfile: dev.h,v $ $Revision: 1.4 $ $Dat
|
|||
* |-----------|---> NSSSlot <--> NSSToken
|
||||
*/
|
||||
|
||||
/* XXX These should probably all be "nss" not "NSS". Though the types are
|
||||
* exposed, the API's should not be (with the exception of functions
|
||||
* put in a friend header.
|
||||
*/
|
||||
|
||||
#ifndef DEVT_H
|
||||
#include "devt.h"
|
||||
#endif /* DEVT_H */
|
||||
|
|
@ -72,7 +67,7 @@ static const char DEV_CVS_ID[] = "@(#) $RCSfile: dev.h,v $ $Revision: 1.4 $ $Dat
|
|||
PR_BEGIN_EXTERN_C
|
||||
|
||||
NSS_EXTERN NSSModule *
|
||||
NSSModule_Create
|
||||
nssModule_Create
|
||||
(
|
||||
NSSUTF8 *moduleOpt,
|
||||
NSSUTF8 *uriOpt,
|
||||
|
|
@ -83,43 +78,43 @@ NSSModule_Create
|
|||
|
||||
/* This is to use the new loading mechanism. */
|
||||
NSS_EXTERN NSSModule *
|
||||
NSSModule_CreateFromSpec
|
||||
nssModule_CreateFromSpec
|
||||
(
|
||||
NSSUTF8 *moduleSpec
|
||||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSModule_Destroy
|
||||
nssModule_Destroy
|
||||
(
|
||||
NSSModule *mod
|
||||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSModule_Load
|
||||
nssModule_Load
|
||||
(
|
||||
NSSModule *mod
|
||||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSModule_Unload
|
||||
nssModule_Unload
|
||||
(
|
||||
NSSModule *mod
|
||||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSModule_LogoutAllSlots
|
||||
nssModule_LogoutAllSlots
|
||||
(
|
||||
NSSModule *mod
|
||||
);
|
||||
|
||||
NSS_EXTERN NSSSlot **
|
||||
NSSModule_GetSlots
|
||||
nssModule_GetSlots
|
||||
(
|
||||
NSSModule *mod
|
||||
);
|
||||
|
||||
NSS_EXTERN NSSSlot *
|
||||
NSSModule_FindSlotByName
|
||||
nssModule_FindSlotByName
|
||||
(
|
||||
NSSModule *mod,
|
||||
NSSUTF8 *slotName
|
||||
|
|
@ -129,7 +124,7 @@ NSSModule_FindSlotByName
|
|||
* function. Do we want NSS to have access to this at the module level?
|
||||
*/
|
||||
NSS_EXTERN PRStatus *
|
||||
NSSModule_TraverseCertificates
|
||||
nssModule_TraverseCertificates
|
||||
(
|
||||
NSSModule *mod,
|
||||
PRStatus (*callback)(NSSCertificate *c, void *arg),
|
||||
|
|
@ -137,7 +132,7 @@ NSSModule_TraverseCertificates
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSSlot *
|
||||
NSSSlot_Create
|
||||
nssSlot_Create
|
||||
(
|
||||
NSSArena *arenaOpt,
|
||||
CK_SLOT_ID slotId,
|
||||
|
|
@ -145,20 +140,20 @@ NSSSlot_Create
|
|||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSSlot_Destroy
|
||||
nssSlot_Destroy
|
||||
(
|
||||
NSSSlot *slot
|
||||
);
|
||||
|
||||
NSS_EXTERN NSSUTF8 *
|
||||
NSSSlot_GetName
|
||||
nssSlot_GetName
|
||||
(
|
||||
NSSSlot *slot,
|
||||
NSSArena *arenaOpt
|
||||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSSlot_Login
|
||||
nssSlot_Login
|
||||
(
|
||||
NSSSlot *slot,
|
||||
PRBool asSO,
|
||||
|
|
@ -168,7 +163,7 @@ extern const NSSError NSS_ERROR_INVALID_PASSWORD;
|
|||
extern const NSSError NSS_ERROR_USER_CANCELED;
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSSlot_Logout
|
||||
nssSlot_Logout
|
||||
(
|
||||
NSSSlot *slot,
|
||||
nssSession *sessionOpt
|
||||
|
|
@ -177,14 +172,14 @@ NSSSlot_Logout
|
|||
#define NSSSLOT_ASK_PASSWORD_FIRST_TIME -1
|
||||
#define NSSSLOT_ASK_PASSWORD_EVERY_TIME 0
|
||||
NSS_EXTERN void
|
||||
NSSSlot_SetPasswordDefaults
|
||||
nssSlot_SetPasswordDefaults
|
||||
(
|
||||
NSSSlot *slot,
|
||||
PRInt32 askPasswordTimeout
|
||||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSSlot_SetPassword
|
||||
nssSlot_SetPassword
|
||||
(
|
||||
NSSSlot *slot,
|
||||
NSSCallback pwcb
|
||||
|
|
@ -193,11 +188,11 @@ extern const NSSError NSS_ERROR_INVALID_PASSWORD;
|
|||
extern const NSSError NSS_ERROR_USER_CANCELED;
|
||||
|
||||
/*
|
||||
* NSSSlot_IsLoggedIn
|
||||
* nssSlot_IsLoggedIn
|
||||
*/
|
||||
|
||||
NSS_EXTERN nssSession *
|
||||
NSSSlot_CreateSession
|
||||
nssSlot_CreateSession
|
||||
(
|
||||
NSSSlot *slot,
|
||||
NSSArena *arenaOpt,
|
||||
|
|
@ -205,7 +200,7 @@ NSSSlot_CreateSession
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSToken *
|
||||
NSSToken_Create
|
||||
nssToken_Create
|
||||
(
|
||||
NSSArena *arenaOpt,
|
||||
CK_SLOT_ID slotID,
|
||||
|
|
@ -213,7 +208,7 @@ NSSToken_Create
|
|||
);
|
||||
|
||||
NSS_EXTERN PRStatus
|
||||
NSSToken_Destroy
|
||||
nssToken_Destroy
|
||||
(
|
||||
NSSToken *tok
|
||||
);
|
||||
|
|
@ -223,7 +218,7 @@ NSSToken_Destroy
|
|||
* Return the object as an NSS type.
|
||||
*/
|
||||
NSS_EXTERN NSSCertificate *
|
||||
NSSToken_ImportCertificate
|
||||
nssToken_ImportCertificate
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -231,7 +226,7 @@ NSSToken_ImportCertificate
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSPublicKey *
|
||||
NSSToken_ImportPublicKey
|
||||
nssToken_ImportPublicKey
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -239,7 +234,7 @@ NSSToken_ImportPublicKey
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSPrivateKey *
|
||||
NSSToken_ImportPrivateKey
|
||||
nssToken_ImportPrivateKey
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -247,7 +242,7 @@ NSSToken_ImportPrivateKey
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSSymmetricKey *
|
||||
NSSToken_ImportSymmetricKey
|
||||
nssToken_ImportSymmetricKey
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -255,7 +250,7 @@ NSSToken_ImportSymmetricKey
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSPublicKey *
|
||||
NSSToken_GenerateKeyPair
|
||||
nssToken_GenerateKeyPair
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt
|
||||
|
|
@ -263,7 +258,7 @@ NSSToken_GenerateKeyPair
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSSymmetricKey *
|
||||
NSSToken_GenerateSymmetricKey
|
||||
nssToken_GenerateSymmetricKey
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt
|
||||
|
|
@ -272,7 +267,7 @@ NSSToken_GenerateSymmetricKey
|
|||
|
||||
/* Permanently remove an object from the token. */
|
||||
NSS_EXTERN PRStatus
|
||||
NSSToken_DeleteStoredObject
|
||||
nssToken_DeleteStoredObject
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -280,7 +275,7 @@ NSSToken_DeleteStoredObject
|
|||
);
|
||||
|
||||
NSS_EXTERN NSSCertificate **
|
||||
NSSToken_FindCertificatesByTemplate
|
||||
nssToken_FindCertificatesByTemplate
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -293,7 +288,7 @@ NSSToken_FindCertificatesByTemplate
|
|||
|
||||
/* again, a questionable function. maybe some tokens allow this? */
|
||||
NSS_EXTERN PRStatus *
|
||||
NSSToken_TraverseCertificates
|
||||
nssToken_TraverseCertificates
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -322,7 +317,7 @@ nssSession_ExitMonitor
|
|||
);
|
||||
|
||||
#ifdef DEBUG
|
||||
void NSSModule_Debug(NSSModule *m);
|
||||
void nssModule_Debug(NSSModule *m);
|
||||
#endif
|
||||
|
||||
PR_END_EXTERN_C
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: module.c,v $ $Revision: 1.2 $ $Date: 2001/09/18 20:54:28 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: module.c,v $ $Revision: 1.3 $ $Date: 2001/09/19 21:47:23 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef DEV_H
|
||||
|
|
@ -105,7 +105,7 @@ s_ck_initialize_args = {
|
|||
* if provided. XXX use the opaque arg also, right?
|
||||
*/
|
||||
NSS_IMPLEMENT NSSModule *
|
||||
NSSModule_Create
|
||||
nssModule_Create
|
||||
(
|
||||
NSSUTF8 *moduleOpt,
|
||||
NSSUTF8 *uriOpt,
|
||||
|
|
@ -190,7 +190,7 @@ module_load_slots(NSSModule *mod)
|
|||
}
|
||||
/* Initialize each slot */
|
||||
for (i=0; i<ulNumSlots; i++) {
|
||||
slots[i] = NSSSlot_Create(mod->arena, slotIDs[i], mod);
|
||||
slots[i] = nssSlot_Create(mod->arena, slotIDs[i], mod);
|
||||
}
|
||||
nss_ZFreeIf(slotIDs);
|
||||
#ifdef arena_mark_bug_fixed
|
||||
|
|
@ -217,21 +217,21 @@ loser:
|
|||
* kind of consistency check is needed here, or perhaps at a higher level.
|
||||
*/
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSModule_Destroy
|
||||
nssModule_Destroy
|
||||
(
|
||||
NSSModule *mod
|
||||
)
|
||||
{
|
||||
if (--mod->refCount == 0) {
|
||||
/* Ignore any failure here. */
|
||||
(void)NSSModule_Unload(mod);
|
||||
(void)nssModule_Unload(mod);
|
||||
return NSSArena_Destroy(mod->arena);
|
||||
}
|
||||
return PR_SUCCESS;
|
||||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSModule_Load
|
||||
nssModule_Load
|
||||
(
|
||||
NSSModule *mod
|
||||
)
|
||||
|
|
@ -291,7 +291,7 @@ loser:
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSModule_Unload
|
||||
nssModule_Unload
|
||||
(
|
||||
NSSModule *mod
|
||||
)
|
||||
|
|
@ -308,7 +308,7 @@ NSSModule_Unload
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus *
|
||||
NSSModule_TraverseCertificates
|
||||
nssModule_TraverseCertificates
|
||||
(
|
||||
NSSModule *mod,
|
||||
PRStatus (*callback)(NSSCertificate *c, void *arg),
|
||||
|
|
@ -318,7 +318,7 @@ NSSModule_TraverseCertificates
|
|||
PRUint32 i;
|
||||
for (i=0; i<mod->numSlots; i++) {
|
||||
/* might as well skip straight to token, right? or is this slot? */
|
||||
NSSToken_TraverseCertificates(mod->slots[i]->token,
|
||||
nssToken_TraverseCertificates(mod->slots[i]->token,
|
||||
NULL, callback, arg);
|
||||
}
|
||||
return NULL;
|
||||
|
|
@ -326,7 +326,7 @@ NSSModule_TraverseCertificates
|
|||
|
||||
#ifdef DEBUG
|
||||
void
|
||||
NSSModule_Debug(NSSModule *m)
|
||||
nssModule_Debug(NSSModule *m)
|
||||
{
|
||||
PRUint32 i;
|
||||
printf("\n");
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: slot.c,v $ $Revision: 1.5 $ $Date: 2001/09/19 21:37:20 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: slot.c,v $ $Revision: 1.6 $ $Date: 2001/09/19 21:47:23 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef DEV_H
|
||||
|
|
@ -74,7 +74,7 @@ nss_ck_slot_notify
|
|||
* any uses of slots where independence is needed?
|
||||
*/
|
||||
NSS_IMPLEMENT NSSSlot *
|
||||
NSSSlot_Create
|
||||
nssSlot_Create
|
||||
(
|
||||
NSSArena *arenaOpt,
|
||||
CK_SLOT_ID slotID,
|
||||
|
|
@ -142,7 +142,7 @@ NSSSlot_Create
|
|||
rvSlot->ckFlags = slotInfo.flags;
|
||||
/* Initialize the token if present. */
|
||||
if (slotInfo.flags & CKF_TOKEN_PRESENT) {
|
||||
token = NSSToken_Create(arena, slotID, rvSlot);
|
||||
token = nssToken_Create(arena, slotID, rvSlot);
|
||||
if (!token) {
|
||||
goto loser;
|
||||
}
|
||||
|
|
@ -170,7 +170,7 @@ loser:
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSSlot_Destroy
|
||||
nssSlot_Destroy
|
||||
(
|
||||
NSSSlot *slot
|
||||
)
|
||||
|
|
@ -183,7 +183,7 @@ NSSSlot_Destroy
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT NSSUTF8 *
|
||||
NSSSlot_GetName
|
||||
nssSlot_GetName
|
||||
(
|
||||
NSSSlot *slot,
|
||||
NSSArena *arenaOpt
|
||||
|
|
@ -350,7 +350,7 @@ nssslot_change_password(NSSSlot *slot, nssSession *rwSession, NSSCallback pwcb)
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSSlot_Login
|
||||
nssSlot_Login
|
||||
(
|
||||
NSSSlot *slot,
|
||||
PRBool asSO,
|
||||
|
|
@ -363,7 +363,7 @@ NSSSlot_Login
|
|||
needsInit = PR_FALSE; /* XXX */
|
||||
needsLogin = PR_TRUE; /* XXX */
|
||||
if (needsInit) {
|
||||
return NSSSlot_SetPassword(slot, pwcb);
|
||||
return nssSlot_SetPassword(slot, pwcb);
|
||||
} else if (needsLogin) {
|
||||
return nssslot_login(slot, slot->token->defaultSession,
|
||||
userType, pwcb);
|
||||
|
|
@ -372,7 +372,7 @@ NSSSlot_Login
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSSlot_Logout
|
||||
nssSlot_Logout
|
||||
(
|
||||
NSSSlot *slot,
|
||||
nssSession *sessionOpt
|
||||
|
|
@ -393,7 +393,7 @@ NSSSlot_Logout
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT void
|
||||
NSSSlot_SetPasswordDefaults
|
||||
nssSlot_SetPasswordDefaults
|
||||
(
|
||||
NSSSlot *slot,
|
||||
PRInt32 askPasswordTimeout
|
||||
|
|
@ -403,7 +403,7 @@ NSSSlot_SetPasswordDefaults
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSSlot_SetPassword
|
||||
nssSlot_SetPassword
|
||||
(
|
||||
NSSSlot *slot,
|
||||
NSSCallback pwcb
|
||||
|
|
@ -413,7 +413,7 @@ NSSSlot_SetPassword
|
|||
nssSession *rwSession;
|
||||
PRBool needsInit;
|
||||
needsInit = PR_FALSE; /* XXX */
|
||||
rwSession = NSSSlot_CreateSession(slot, NULL, PR_TRUE);
|
||||
rwSession = nssSlot_CreateSession(slot, NULL, PR_TRUE);
|
||||
if (needsInit) {
|
||||
nssrv = nssslot_init_password(slot, rwSession, pwcb);
|
||||
} else {
|
||||
|
|
@ -424,7 +424,7 @@ NSSSlot_SetPassword
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT nssSession *
|
||||
NSSSlot_CreateSession
|
||||
nssSlot_CreateSession
|
||||
(
|
||||
NSSSlot *slot,
|
||||
NSSArena *arenaOpt,
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.4 $ $Date: 2001/09/19 21:37:21 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.5 $ $Date: 2001/09/19 21:47:23 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef DEV_H
|
||||
|
|
@ -63,7 +63,7 @@ static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.4 $ $Date:
|
|||
* any uses of slots where independence is needed?
|
||||
*/
|
||||
NSS_IMPLEMENT NSSToken *
|
||||
NSSToken_Create
|
||||
nssToken_Create
|
||||
(
|
||||
NSSArena *arenaOpt,
|
||||
CK_SLOT_ID slotID,
|
||||
|
|
@ -116,7 +116,7 @@ NSSToken_Create
|
|||
}
|
||||
}
|
||||
/* Open a default session handle for the token. */
|
||||
session = NSSSlot_CreateSession(parent, arena, PR_FALSE);
|
||||
session = nssSlot_CreateSession(parent, arena, PR_FALSE);
|
||||
if (session == NULL) {
|
||||
goto loser;
|
||||
}
|
||||
|
|
@ -156,7 +156,7 @@ loser:
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus
|
||||
NSSToken_Destroy
|
||||
nssToken_Destroy
|
||||
(
|
||||
NSSToken *tok
|
||||
)
|
||||
|
|
@ -191,7 +191,7 @@ examine_cert_callback(NSSToken *t, nssSession *session,
|
|||
PRStatus cbrv;
|
||||
NSSCertificate *cert;
|
||||
struct certCallbackStr *ccb = (struct certCallbackStr *)arg;
|
||||
/* maybe it should be NSSToken_CreateCertificate(token, handle); */
|
||||
/* maybe it should be nssToken_CreateCertificate(token, handle); */
|
||||
cert = NSSCertificate_CreateFromHandle(h, session, t->slot);
|
||||
if (!cert) {
|
||||
goto loser;
|
||||
|
|
@ -268,7 +268,7 @@ loser:
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT PRStatus *
|
||||
NSSToken_TraverseCertificates
|
||||
nssToken_TraverseCertificates
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
@ -294,7 +294,7 @@ NSSToken_TraverseCertificates
|
|||
}
|
||||
|
||||
NSS_IMPLEMENT NSSCertificate **
|
||||
NSSToken_FindCertificatesByTemplate
|
||||
nssToken_FindCertificatesByTemplate
|
||||
(
|
||||
NSSToken *tok,
|
||||
nssSession *sessionOpt,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче