diff options
| author | jpierre%netscape.com <devnull@localhost> | 2004-01-07 23:12:01 +0000 |
|---|---|---|
| committer | jpierre%netscape.com <devnull@localhost> | 2004-01-07 23:12:01 +0000 |
| commit | 509a86b2709db1d8ce1ec4753ac583539bc58864 (patch) | |
| tree | 792e3a074e51a02f9a476bc1f5cc699f41ff3845 | |
| parent | 243e5691254a7ea99dc2434ea468c9def24607e8 (diff) | |
| download | nss-hg-509a86b2709db1d8ce1ec4753ac583539bc58864.tar.gz | |
Rename PK11_FindSlotsByAliases to PK11_FindSlotsByNames
| -rw-r--r-- | security/nss/lib/nss/nss.def | 6 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11func.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11slot.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def index 62793cf2d..87cf80aa7 100644 --- a/security/nss/lib/nss/nss.def +++ b/security/nss/lib/nss/nss.def @@ -758,17 +758,17 @@ SECKEY_PublicKeyStrengthInBits; ;+}; ;+NSS_3.9 { # NSS 3.9 release ;+ global: -DER_DecodeTimeChoice; CERT_DestroyOidSequence; -DER_EncodeTimeChoice; CERT_GetOidString; ;;CERT_TimeChoiceTemplate DATA ; +DER_DecodeTimeChoice; +DER_EncodeTimeChoice; DSAU_DecodeDerSigToLen; DSAU_EncodeDerSigWithLen; NSS_Get_CERT_TimeChoiceTemplate; PK11_DeriveWithFlagsPerm; PK11_ExportEncryptedPrivKeyInfo; -PK11_FindSlotsByAliases; +PK11_FindSlotsByNames; PK11_GetSymKeyType; PK11_MoveSymKey; PK11_PubDeriveExtended; diff --git a/security/nss/lib/pk11wrap/pk11func.h b/security/nss/lib/pk11wrap/pk11func.h index 2d2d47a4f..e78c864ad 100644 --- a/security/nss/lib/pk11wrap/pk11func.h +++ b/security/nss/lib/pk11wrap/pk11func.h @@ -140,12 +140,12 @@ SECStatus PK11_TokenRefresh(PK11SlotInfo *slot); PK11SlotInfo *PK11_FindSlotByName(char *name); PK11SlotInfo *PK11_FindSlotBySerial(char *serial); /****************************************************************** - * PK11_FindSlotsByAliases searches for a PK11SlotInfo using one or + * PK11_FindSlotsByNames searches for a PK11SlotInfo using one or * more criteria : dllName, slotName and tokenName . In addition, if * presentOnly is set , only slots with a token inserted will be * returned. ******************************************************************/ -PK11SlotList *PK11_FindSlotsByAliases(const char *dllName, +PK11SlotList *PK11_FindSlotsByNames(const char *dllName, const char* slotName, const char* tokenName, PRBool presentOnly); PRBool PK11_IsReadOnly(PK11SlotInfo *slot); PRBool PK11_IsInternal(PK11SlotInfo *slot); diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c index d5a2f6f5d..875495940 100644 --- a/security/nss/lib/pk11wrap/pk11slot.c +++ b/security/nss/lib/pk11wrap/pk11slot.c @@ -566,7 +566,7 @@ SECMOD_HasRootCerts(void) * Functions to find specific slots. ***********************************************************/ PK11SlotList * -PK11_FindSlotsByAliases(const char *dllName, const char* slotName, +PK11_FindSlotsByNames(const char *dllName, const char* slotName, const char* tokenName, PRBool presentOnly) { SECMODModuleList *mlp; |