Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mozilla/security/nss/lib/pk11wrap/pk11pub.h

Issue 11359091: Update NSS to NSS 3.14 pre-release snapshot 2012-06-26 01:00:00 PDT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Remove the RCS Id from nss-shvfy-const.patch Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« mozilla/security/nss/lib/cryptohi/secvfy.c ('K') | « mozilla/security/nss/lib/pk11wrap/pk11priv.h ('k') | mozilla/security/nss/lib/pk11wrap/pk11skey.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mozilla/security/nss/lib/pk11wrap/pk11pub.h
===================================================================
--- mozilla/security/nss/lib/pk11wrap/pk11pub.h (revision 164196)
+++ mozilla/security/nss/lib/pk11wrap/pk11pub.h (working copy)
@@ -147,9 +147,13 @@
PRBool PK11_DoesMechanism(PK11SlotInfo *slot, CK_MECHANISM_TYPE type);
PK11SlotList * PK11_GetAllTokens(CK_MECHANISM_TYPE type,PRBool needRW,
PRBool loadCerts, void *wincx);
-PK11SlotInfo *PK11_GetBestSlotMultiple(CK_MECHANISM_TYPE *type, int count,
- void *wincx);
+PK11SlotInfo *PK11_GetBestSlotMultipleWithKeySize(CK_MECHANISM_TYPE *type,
+ unsigned long *keySize, unsigned int count, void *wincx);
+PK11SlotInfo *PK11_GetBestSlotMultiple(CK_MECHANISM_TYPE *type,
+ unsigned int count, void *wincx);
PK11SlotInfo *PK11_GetBestSlot(CK_MECHANISM_TYPE type, void *wincx);
+PK11SlotInfo *PK11_GetBestSlotWithKeySize(CK_MECHANISM_TYPE type,
+ unsigned long keySize, void *wincx);
CK_MECHANISM_TYPE PK11_GetBestWrapMechanism(PK11SlotInfo *slot);
int PK11_GetBestKeyLength(PK11SlotInfo *slot, CK_MECHANISM_TYPE type);
« mozilla/security/nss/lib/cryptohi/secvfy.c ('K') | « mozilla/security/nss/lib/pk11wrap/pk11priv.h ('k') | mozilla/security/nss/lib/pk11wrap/pk11skey.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698