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

Side by Side Diff: nss/lib/pk11wrap/pk11pub.h

Issue 195763027: Update NSS to NSS_3_16_RC0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Use the RTM tag Created 6 years, 9 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « nss/lib/nss/nss.h ('k') | nss/lib/pk11wrap/pk11slot.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 #ifndef _PK11PUB_H_ 4 #ifndef _PK11PUB_H_
5 #define _PK11PUB_H_ 5 #define _PK11PUB_H_
6 #include "plarena.h" 6 #include "plarena.h"
7 #include "seccomon.h" 7 #include "seccomon.h"
8 #include "secoidt.h" 8 #include "secoidt.h"
9 #include "secdert.h" 9 #include "secdert.h"
10 #include "keyt.h" 10 #include "keyt.h"
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 */ 765 */
766 CK_MECHANISM_TYPE 766 CK_MECHANISM_TYPE
767 PK11_GetPBECryptoMechanism(SECAlgorithmID *algid, 767 PK11_GetPBECryptoMechanism(SECAlgorithmID *algid,
768 SECItem **param, SECItem *pwd); 768 SECItem **param, SECItem *pwd);
769 769
770 /********************************************************************** 770 /**********************************************************************
771 * Functions to manage secmod flags 771 * Functions to manage secmod flags
772 **********************************************************************/ 772 **********************************************************************/
773 PK11DefaultArrayEntry *PK11_GetDefaultArray(int *size); 773 PK11DefaultArrayEntry *PK11_GetDefaultArray(int *size);
774 SECStatus PK11_UpdateSlotAttribute(PK11SlotInfo *slot, 774 SECStatus PK11_UpdateSlotAttribute(PK11SlotInfo *slot,
775 » » » » PK11DefaultArrayEntry *entry, PRBool add); 775 » » » » const PK11DefaultArrayEntry *entry,
776 » » » » PRBool add);
776 777
777 /********************************************************************** 778 /**********************************************************************
778 * Functions to look at PKCS #11 dependent data 779 * Functions to look at PKCS #11 dependent data
779 **********************************************************************/ 780 **********************************************************************/
780 PK11GenericObject *PK11_FindGenericObjects(PK11SlotInfo *slot, 781 PK11GenericObject *PK11_FindGenericObjects(PK11SlotInfo *slot,
781 CK_OBJECT_CLASS objClass); 782 CK_OBJECT_CLASS objClass);
782 PK11GenericObject *PK11_GetNextGenericObject(PK11GenericObject *object); 783 PK11GenericObject *PK11_GetNextGenericObject(PK11GenericObject *object);
783 PK11GenericObject *PK11_GetPrevGenericObject(PK11GenericObject *object); 784 PK11GenericObject *PK11_GetPrevGenericObject(PK11GenericObject *object);
784 SECStatus PK11_UnlinkGenericObject(PK11GenericObject *object); 785 SECStatus PK11_UnlinkGenericObject(PK11GenericObject *object);
785 SECStatus PK11_LinkGenericObject(PK11GenericObject *list, 786 SECStatus PK11_LinkGenericObject(PK11GenericObject *list,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot, 834 PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot,
834 CERTCertificate *cert, void *pwarg); 835 CERTCertificate *cert, void *pwarg);
835 SECItem * 836 SECItem *
836 PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key); 837 PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key);
837 838
838 PRBool SECMOD_HasRootCerts(void); 839 PRBool SECMOD_HasRootCerts(void);
839 840
840 SEC_END_PROTOS 841 SEC_END_PROTOS
841 842
842 #endif 843 #endif
OLDNEW
« no previous file with comments | « nss/lib/nss/nss.h ('k') | nss/lib/pk11wrap/pk11slot.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698