← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/cryptohi/cryptohi.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-31 02:23:43 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100331022343-ck07ylqk8q474x26
Tags: 3.12.6-0ubuntu0.9.10.1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols 
* Enable transitional scheme for SSL renegotiation
  - add 97_SSL_RENEGOTIATE_TRANSITIONAL.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/cryptohi/cryptohi.h
37
37
 * the terms of any one of the MPL, the GPL or the LGPL.
38
38
 *
39
39
 * ***** END LICENSE BLOCK ***** */
40
 
/* $Id: cryptohi.h,v 1.12 2008/06/14 14:20:00 wtc%google.com Exp $ */
 
40
/* $Id: cryptohi.h,v 1.14 2010/02/10 00:49:43 wtc%google.com Exp $ */
41
41
 
42
42
#ifndef _CRYPTOHI_H_
43
43
#define _CRYPTOHI_H_
114
114
**      "input" the input data to sign
115
115
**      "inputLen" the length of the input data
116
116
*/
117
 
extern SECStatus SGN_Update(SGNContext *cx, unsigned char *input,
 
117
extern SECStatus SGN_Update(SGNContext *cx, const unsigned char *input,
118
118
                           unsigned int inputLen);
119
119
 
120
120
/*
137
137
**      "algid" the signature/hash algorithm to sign with 
138
138
**              (must be compatible with the key type).
139
139
*/
140
 
extern SECStatus SEC_SignData(SECItem *result, unsigned char *buf, int len,
 
140
extern SECStatus SEC_SignData(SECItem *result,
 
141
                             const unsigned char *buf, int len,
141
142
                             SECKEYPrivateKey *pk, SECOidTag algid);
142
143
 
143
144
/*
348
349
**          the key type.
349
350
**      "wincx" void pointer to the window context
350
351
*/
351
 
extern SECStatus VFY_VerifyData(unsigned char *buf, int len,
352
 
                                SECKEYPublicKey *key, SECItem *sig,
 
352
extern SECStatus VFY_VerifyData(const unsigned char *buf, int len,
 
353
                                const SECKEYPublicKey *key, const SECItem *sig,
353
354
                                SECOidTag sigAlg, void *wincx);
354
355
/*
355
356
** Verify the signature on a block of data. The signature data is an RSA
391
392
*/
392
393
extern SECStatus VFY_VerifyDataWithAlgorithmID(const unsigned char *buf, 
393
394
                                int len, const SECKEYPublicKey *key,
394
 
                                 const SECItem *sig,
 
395
                                const SECItem *sig,
395
396
                                const SECAlgorithmID *algid, SECOidTag *hash,
396
397
                                void *wincx);
397
398