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

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

Issue 12207073: Update to NSS 3.14.3 Beta 1 for the TLS CBC constant-time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Remove unrelated WIN64 changes from nss.gyp Created 7 years, 10 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 | « mozilla/security/nss/lib/pk11wrap/pk11obj.c ('k') | mozilla/security/nss/lib/softoken/pkcs11.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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 * Return the length in bytes of a signature generated with the 653 * Return the length in bytes of a signature generated with the
654 * private key. 654 * private key.
655 * 655 *
656 * Return 0 or -1 on failure. (XXX Should we fix it to always return 656 * Return 0 or -1 on failure. (XXX Should we fix it to always return
657 * -1 on failure?) 657 * -1 on failure?)
658 */ 658 */
659 int PK11_SignatureLen(SECKEYPrivateKey *key); 659 int PK11_SignatureLen(SECKEYPrivateKey *key);
660 PK11SlotInfo * PK11_GetSlotFromPrivateKey(SECKEYPrivateKey *key); 660 PK11SlotInfo * PK11_GetSlotFromPrivateKey(SECKEYPrivateKey *key);
661 SECStatus PK11_Sign(SECKEYPrivateKey *key, SECItem *sig, 661 SECStatus PK11_Sign(SECKEYPrivateKey *key, SECItem *sig,
662 const SECItem *hash); 662 const SECItem *hash);
663 SECStatus PK11_SignWithSymKey(PK11SymKey *symKey, CK_MECHANISM_TYPE mechanism,
664 SECItem *param, SECItem *sig, const SECItem *data);
663 SECStatus PK11_VerifyRecover(SECKEYPublicKey *key, const SECItem *sig, 665 SECStatus PK11_VerifyRecover(SECKEYPublicKey *key, const SECItem *sig,
664 SECItem *dsig, void * wincx); 666 SECItem *dsig, void * wincx);
665 SECStatus PK11_Verify(SECKEYPublicKey *key, const SECItem *sig, 667 SECStatus PK11_Verify(SECKEYPublicKey *key, const SECItem *sig,
666 const SECItem *hash, void *wincx); 668 const SECItem *hash, void *wincx);
667 669
668 670
669 671
670 /********************************************************************** 672 /**********************************************************************
671 * Crypto Contexts 673 * Crypto Contexts
672 **********************************************************************/ 674 **********************************************************************/
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot, 821 PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot,
820 CERTCertificate *cert, void *pwarg); 822 CERTCertificate *cert, void *pwarg);
821 SECItem * 823 SECItem *
822 PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key); 824 PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key);
823 825
824 PRBool SECMOD_HasRootCerts(void); 826 PRBool SECMOD_HasRootCerts(void);
825 827
826 SEC_END_PROTOS 828 SEC_END_PROTOS
827 829
828 #endif 830 #endif
OLDNEW
« no previous file with comments | « mozilla/security/nss/lib/pk11wrap/pk11obj.c ('k') | mozilla/security/nss/lib/softoken/pkcs11.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698